rpms/egoboo/devel egoboo-2.4.4-svn-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 egoboo.spec, 1.3, 1.4 sources, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Oct 29 20:43:44 UTC 2007
- Previous message (by thread): rpms/psi/devel .cvsignore, 1.8, 1.9 psi.spec, 1.18, 1.19 sources, 1.10, 1.11
- Next message (by thread): rpms/rhgb/F-8 .cvsignore, 1.28, 1.29 rhgb.spec, 1.85, 1.86 sources, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/egoboo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17584
Modified Files:
.cvsignore egoboo.spec sources
Added Files:
egoboo-2.4.4-svn-fixes.patch
Log Message:
* Mon Oct 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.4b-1
- New upstream release 2.4.4b
egoboo-2.4.4-svn-fixes.patch:
--- NEW FILE egoboo-2.4.4-svn-fixes.patch ---
--- ego244bsrc/game/gltexture.c 2007-10-08 12:07:16.000000000 +0200
+++ trunk/game/gltexture.c 2007-10-29 19:59:22.000000000 +0100
@@ -75,14 +92,15 @@
}
else
{
-#ifdef SDL_LIL_ENDIAN
- tempSurface = SDL_CreateRGBSurface( SDL_SWSURFACE, texture->txDimensions, texture->txDimensions, 24, 0x0000FF, 0x00FF00, 0xFF0000, 0x000000);
-#else
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
tempSurface = SDL_CreateRGBSurface( SDL_SWSURFACE, texture->txDimensions, texture->txDimensions, 24, 0xFF0000, 0x00FF00, 0x0000FF, 0x000000);
+#else
+ tempSurface = SDL_CreateRGBSurface( SDL_SWSURFACE, texture->txDimensions, texture->txDimensions, 24, 0x0000FF, 0x00FF00, 0xFF0000, 0x000000);
+
#endif
}
SDL_BlitSurface( imageSurface, &imageSurface->clip_rect, tempSurface, &imageSurface->clip_rect );
-
+
/* actually create the OpenGL textures */
if(texturefilter > 2) //Draw with mipmaps?
{
@@ -189,7 +207,7 @@
}
else
{
- #ifdef SDL_LIL_ENDIAN
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
tempSurface = SDL_CreateRGBSurface( SDL_SWSURFACE, texture->txDimensions, texture->txDimensions, 32, 0x0000FF, 0x00FF00, 0xFF0000, 0x000000);
#else
tempSurface = SDL_CreateRGBSurface( SDL_SWSURFACE, texture->txDimensions, texture->txDimensions, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000);
@@ -207,7 +225,7 @@
{
if( p[x+y*texture->txDimensions] != key )
{
- #ifdef SDL_LIL_ENDIAN
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
p[x+y*texture->txDimensions] = p[x+y*texture->txDimensions] | 0xFF000000;
#else
p[x+y*texture->txDimensions] = p[x+y*texture->txDimensions] | 0x000000FF;
--- ego244bsrc/game/Font.c 2007-10-08 12:07:14.000000000 +0200
+++ trunk/game/Font.c 2007-10-29 20:25:04.000000000 +0100
@@ -233,11 +249,11 @@
strncpy(buffer, text, len);
line = strtok(buffer, "\n");
- *height = 0;
+ *width = *height = 0;
while (line != NULL)
{
TTF_SizeText(font->ttfFont, line, &tmp_w, &tmp_h);
- *width = max(*width, tmp_w);
+ *width = (*width > tmp_w) ? *width : tmp_w;
*height += spacing;
line = strtok(NULL, "\n");
--- ego244bsrc/game/graphic.c 2007-10-16 19:51:38.000000000 +0200
+++ trunk/game/graphic.c 2007-10-29 20:25:04.000000000 +0100
@@ -2390,12 +2411,12 @@
cnt++;
}
}
- /* REMOVE?
+
// Foreground overlay
if(overlayon)
{
render_foreground_overlay(5); // Texture 5 is watertop.bmp
- }*/
+ }
}
//--------------------------------------------------------------------------------------------
@@ -3393,34 +3414,16 @@
// In-Game help
sprintf(text, "!!!MOUSE HELP!!!");
draw_string(text, 0, y); y+=fontyspacing;
- if(rtscontrol)
- {
- if(allselect)
- {
- sprintf(text, " Left Click to order units");
- draw_string(text, 0, y); y+=fontyspacing;
- }
- else
- {
- sprintf(text, " Left Drag to select units");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " Left Click to order them");
- draw_string(text, 0, y); y+=fontyspacing;
- }
- }
- else
- {
- sprintf(text, " Edit CONTROLS.TXT to change");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " Left Click to use an item");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " Left and Right Click to grab");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " Middle Click to jump");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " A and S keys do stuff");
- draw_string(text, 0, y); y+=fontyspacing;
- }
+ sprintf(text, " Edit CONTROLS.TXT to change");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " Left Click to use an item");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " Left and Right Click to grab");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " Middle Click to jump");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " A and S keys do stuff");
+ draw_string(text, 0, y); y+=fontyspacing;
sprintf(text, " Right Drag to move camera");
draw_string(text, 0, y); y+=fontyspacing;
}
@@ -3429,44 +3432,28 @@
// In-Game help
sprintf(text, "!!!JOYSTICK HELP!!!");
draw_string(text, 0, y); y+=fontyspacing;
- if(rtscontrol)
- {
- sprintf(text, " Joystick not available");
- draw_string(text, 0, y); y+=fontyspacing;
- }
- else
- {
- sprintf(text, " Edit CONTROLS.TXT to change");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " Hit the buttons");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " You'll figure it out");
- draw_string(text, 0, y); y+=fontyspacing;
- }
+ sprintf(text, " Edit CONTROLS.TXT to change");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " Hit the buttons");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " You'll figure it out");
+ draw_string(text, 0, y); y+=fontyspacing;
}
if(SDLKEYDOWN(SDLK_F3))
{
// In-Game help
sprintf(text, "!!!KEYBOARD HELP!!!");
draw_string(text, 0, y); y+=fontyspacing;
- if(rtscontrol)
- {
- sprintf(text, " Keyboard not available");
- draw_string(text, 0, y); y+=fontyspacing;
- }
- else
- {
- sprintf(text, " Edit CONTROLS.TXT to change");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " TGB control one hand");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " YHN control the other");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " Keypad to move and jump");
- draw_string(text, 0, y); y+=fontyspacing;
- sprintf(text, " Number keys for stats");
- draw_string(text, 0, y); y+=fontyspacing;
- }
+ sprintf(text, " Edit CONTROLS.TXT to change");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " TGB control one hand");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " YHN control the other");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " Keypad to move and jump");
+ draw_string(text, 0, y); y+=fontyspacing;
+ sprintf(text, " Number keys for stats");
+ draw_string(text, 0, y); y+=fontyspacing;
}
if(SDLKEYDOWN(SDLK_F5))
{
@@ -3946,9 +3933,7 @@
// Do unit speech at 11025 KHz
if(sound >= 0 && sound < MAXWAVE)
{
-//REMOVE? channel = Mix_PlayChannel(-1, capwaveindex[chrmodel[leader]][sound], 0);
-//REMOVE? Mix_SetPosition(channel, 0, 0);
- //WRONG FUNCTION. IF YOU WANT THIS TO WORK RIGHT, CONVERT TO PLAY_SOUND
+ play_sound_pvf(capwaveindex[chrmodel[leader]][sound], PANMID, VOLMAX, 11025);
}
}
}
@@ -4337,7 +4322,7 @@
}
// Set the window name
- SDL_WM_SetCaption( "Egoboo ", "Egoboo" );
+ SDL_WM_SetCaption( "Egoboo", "Egoboo" );
if ( gGrabMouse )
{
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/egoboo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Oct 2007 08:32:52 -0000 1.2
+++ .cvsignore 29 Oct 2007 20:43:10 -0000 1.3
@@ -1 +1 @@
-egoboo-2.4.3.tar.gz
+egoboo-2.4.4b.tar.gz
Index: egoboo.spec
===================================================================
RCS file: /cvs/extras/rpms/egoboo/devel/egoboo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- egoboo.spec 25 Oct 2007 13:29:05 -0000 1.3
+++ egoboo.spec 29 Oct 2007 20:43:10 -0000 1.4
@@ -1,6 +1,6 @@
Name: egoboo
-Version: 2.4.3
-Release: 4%{?dist}
+Version: 2.4.4b
+Release: 1%{?dist}
Summary: A top down graphical (3D) RPG in the spirit of Nethack
Group: Amusements/Games
License: GPLv3
@@ -11,6 +11,7 @@
Source2: KNOWN-BUGS.txt
Patch0: %{name}-2.4.3-unix.patch
Patch1: %{name}-2.4.3-opengl-wrapper.patch
+Patch2: %{name}-2.4.4-svn-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_mixer-devel SDL_ttf-devel enet-devel desktop-file-utils
Requires: %{name}-data = %{version}, opengl-games-utils
@@ -24,10 +25,10 @@
%prep
-# Yes upstream put the wrong version in the base dir.
-%setup -q -n egosrc234
+%setup -q -n ego244bsrc
%patch0 -p1
%patch1 -p1
+%patch2 -p1
cp -a %{SOURCE2} .
sed -i 's/\r//g' game/change.log game/Egoboodoc.txt
iconv -f ISO-8859-1 -t UTF8 game/change.log > ChangeLog
@@ -65,6 +66,9 @@
%changelog
+* Mon Oct 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.4b-1
+- New upstream release 2.4.4b
+
* Thu Oct 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.3-4
- Fix yet another crash only occuring on i386 and another one only occuring
when playing a paladin on x86_64 (bz 351171)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/egoboo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Oct 2007 08:32:52 -0000 1.2
+++ sources 29 Oct 2007 20:43:10 -0000 1.3
@@ -1 +1 @@
-7b894078e657d1e7cec61cfa1dcaf27c egoboo-2.4.3.tar.gz
+98f315f4c76ad56a2075e00938c21fe8 egoboo-2.4.4b.tar.gz
- Previous message (by thread): rpms/psi/devel .cvsignore, 1.8, 1.9 psi.spec, 1.18, 1.19 sources, 1.10, 1.11
- Next message (by thread): rpms/rhgb/F-8 .cvsignore, 1.28, 1.29 rhgb.spec, 1.85, 1.86 sources, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list