rpms/freedroid/devel freedroid-1.0.2-cpuhog.patch, NONE, 1.1 freedroid.desktop, 1.1, 1.2 freedroid.spec, 1.9, 1.10
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Jul 8 19:05:40 UTC 2007
- Previous message: rpms/fwbackups/devel .cvsignore, 1.5, 1.6 fwbackups.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message: rpms/roundup/devel .cvsignore, 1.2, 1.3 README.Fedora, 1.1, 1.2 roundup.spec, 1.7, 1.8 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/freedroid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30964
Modified Files:
freedroid.desktop freedroid.spec
Added Files:
freedroid-1.0.2-cpuhog.patch
Log Message:
* Sun Jul 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-7
- Apply partial CPU hogging fix from upstream CVS.
- Desktop entry improvements.
freedroid-1.0.2-cpuhog.patch:
--- NEW FILE freedroid-1.0.2-cpuhog.patch ---
Index: FreeDroid/src/init.c
diff -u FreeDroid/src/init.c:1.192.2.56 FreeDroid/src/init.c:1.192.2.57
--- FreeDroid/src/init.c:1.192.2.56 Tue Sep 23 16:20:02 2003
+++ FreeDroid/src/init.c Tue Nov 4 23:19:23 2003
@@ -913,6 +913,7 @@
GameConfig.ShowDecals = TRUE;
GameConfig.AllMapVisible = TRUE; // classic setting: map always visible
GameConfig.scale = 1.0; // overall scaling of _all_ graphics (e.g. for 320x200 displays)
+ GameConfig.HogCPU = FALSE; // default to being nice
// now load saved options from the config-file
LoadGameConfig ();
Index: FreeDroid/src/main.c
diff -u FreeDroid/src/main.c:1.138.2.28 FreeDroid/src/main.c:1.138.2.29
--- FreeDroid/src/main.c:1.138.2.28 Sat Aug 9 17:31:43 2003
+++ FreeDroid/src/main.c Tue Nov 4 23:19:23 2003
@@ -159,6 +159,9 @@
CheckIfMissionIsComplete ();
+ if (!GameConfig.HogCPU) // don't use up 100% CPU unless requested
+ SDL_Delay (1);
+
ComputeFPSForThisFrame();
} /* while !GameOver */
Index: FreeDroid/src/menu.c
diff -u FreeDroid/src/menu.c:1.54.2.45 FreeDroid/src/menu.c:1.54.2.46
--- FreeDroid/src/menu.c:1.54.2.45 Mon Sep 22 16:50:30 2003
+++ FreeDroid/src/menu.c Tue Nov 4 23:19:23 2003
@@ -510,7 +510,11 @@
SET_SOUND_FX_VOLUME,
SET_GAMMA_CORRECTION,
SET_FULLSCREEN_FLAG,
- BACK };
+ SET_HOG_CPU,
+ BACK
+ };
+
+
while (!finished)
{
@@ -553,6 +562,15 @@
}
break;
+
+ case SET_HOG_CPU:
+ if (FirePressedR())
+ {
+ GameConfig.HogCPU = !GameConfig.HogCPU;
+ MenuItemSelectedSound();
+ }
+ break;
+
case BACK:
if (FirePressedR())
{
Index: FreeDroid/src/misc.c
diff -u FreeDroid/src/misc.c:1.127.2.24 FreeDroid/src/misc.c:1.127.2.25
--- FreeDroid/src/misc.c:1.127.2.24 Tue Sep 23 16:20:02 2003
+++ FreeDroid/src/misc.c Tue Nov 4 23:19:23 2003
@@ -126,6 +126,7 @@
#define SHOW_DECALS "ShowDecals"
#define ALL_MAP_VISIBLE "AllMapVisible"
#define VID_SCALE_FACTOR "Vid_ScaleFactor"
+#define HOG_CPU "Hog_Cpu"
/*----------------------------------------------------------------------
* LoadGameConfig(): load saved options from config-file
@@ -226,6 +227,7 @@
read_variable (data, SHOW_DECALS, "%d", &GameConfig.ShowDecals);
read_variable (data, ALL_MAP_VISIBLE, "%d", &GameConfig.AllMapVisible);
read_variable (data, VID_SCALE_FACTOR, "%f", &GameConfig.scale);
+ read_variable (data, HOG_CPU, "%d", &GameConfig.HogCPU);
free (data);
@@ -271,6 +273,7 @@
fprintf (fp, "%s = %d\n", SHOW_DECALS, GameConfig.ShowDecals);
fprintf (fp, "%s = %d\n", ALL_MAP_VISIBLE, GameConfig.AllMapVisible);
fprintf (fp, "%s = %f\n", VID_SCALE_FACTOR, GameConfig.scale);
+ fprintf (fp, "%s = %d\n", HOG_CPU, GameConfig.HogCPU);
fclose (fp);
return (OK);
Index: FreeDroid/src/ship.c
diff -u FreeDroid/src/ship.c:1.103.2.47 FreeDroid/src/ship.c:1.103.2.48
--- FreeDroid/src/ship.c:1.103.2.47 Mon Sep 22 16:50:30 2003
+++ FreeDroid/src/ship.c Tue Nov 4 23:19:24 2003
@@ -160,6 +158,9 @@
MoveLiftSound ();
}
} /* if downlevel */
+
+ SDL_Delay(10);
+
} /* while !SpaceReleased */
//--------------------
@@ -867,6 +868,10 @@
SDL_UpdateRects (ne_screen, 1, &dst);
+ // don't use full CPU unless requested
+ if (!GameConfig.HogCPU)
+ SDL_Delay(1);
+
last_frame_time = SDL_GetTicks();
}
Index: FreeDroid/src/struct.h
diff -u FreeDroid/src/struct.h:1.99.2.20 FreeDroid/src/struct.h:1.99.2.21
--- FreeDroid/src/struct.h:1.99.2.20 Mon Jul 14 12:52:26 2003
+++ FreeDroid/src/struct.h Tue Nov 4 23:19:24 2003
@@ -84,6 +84,7 @@
int ShowDecals; // show dead droids-ashes...
int AllMapVisible; // complete map is visible?
float scale; // scale the whole graphics by this at load-time
+ int HogCPU; // use 100% CPU or leave it some air to breathe?
}
config_t;
Index: FreeDroid/src/takeover.c
diff -u FreeDroid/src/takeover.c:1.70.2.29 FreeDroid/src/takeover.c:1.70.2.30
--- FreeDroid/src/takeover.c:1.70.2.29 Thu Aug 7 18:55:11 2003
+++ FreeDroid/src/takeover.c Tue Nov 4 23:19:24 2003
@@ -784,6 +784,10 @@
} /* for player */
SDL_Flip (ne_screen);
+
+ // give CPU some air, unless requested otherwise
+ if (!GameConfig.HogCPU)
+ SDL_Delay(1);
return;
Index: FreeDroid/src/text.c
diff -u FreeDroid/src/text.c:1.81.2.18 FreeDroid/src/text.c:1.81.2.19
--- FreeDroid/src/text.c:1.81.2.18 Mon Sep 22 16:50:30 2003
+++ FreeDroid/src/text.c Tue Nov 4 23:19:24 2003
@@ -208,12 +208,15 @@
}
SDL_Flip (ne_screen);
+ if (!GameConfig.HogCPU)
+ SDL_Delay(1);
if (just_started)
{
just_started = FALSE;
now = SDL_GetTicks();
- while ( (!FirePressed()) && (SDL_GetTicks() - now < SHOW_WAIT)) ; // wait before scrolling
+ while ( (!FirePressed()) && (SDL_GetTicks() - now < SHOW_WAIT))
+ SDL_Delay(1); // wait before scrolling
//--------------------
// Returning from this function is only possible after the minimum display time has been
Index: freedroid.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/freedroid/devel/freedroid.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freedroid.desktop 8 Nov 2004 04:20:08 -0000 1.1
+++ freedroid.desktop 8 Jul 2007 19:05:04 -0000 1.2
@@ -1,9 +1,10 @@
[Desktop Entry]
Name=Freedroid
Comment=A Paradroid clone
+Comment[fi]=Paradroid-klooni
Exec=freedroid
-Icon=freedroid.png
+Icon=freedroid
Terminal=false
Type=Application
-Encoding=UTF-8
-Categories=Application;Game;ArcadeGame;
+Categories=Game;ArcadeGame;
+StartupWMClass=freedroid
Index: freedroid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedroid/devel/freedroid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freedroid.spec 29 Aug 2006 20:33:42 -0000 1.9
+++ freedroid.spec 8 Jul 2007 19:05:04 -0000 1.10
@@ -1,6 +1,6 @@
Name: freedroid
Version: 1.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Clone of the C64 game Paradroid
Group: Amusements/Games
@@ -10,6 +10,7 @@
Source1: %{name}.desktop
Patch0: %{name}-cleaninst.patch
Patch1: %{name}-1.0.2-printfs.patch
+Patch2: %{name}-1.0.2-cpuhog.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel
@@ -36,6 +37,7 @@
%setup -q
%patch0 -p0
%patch1 -p1
+%patch2 -p1
%build
@@ -47,13 +49,11 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_datadir}/freedroid/mac-osx
-desktop-file-install \
- --vendor fedora \
+desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
%{SOURCE1}
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-convert graphics/paraicon.bmp \
+convert graphics/paraicon.ico \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/freedroid.png
@@ -79,6 +79,10 @@
%changelog
+* Sun Jul 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-7
+- Apply partial CPU hogging fix from upstream CVS.
+- Desktop entry improvements.
+
* Tue Aug 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-6
- Move data files from %%{_datadir}/games/freedroid to %%{_datadir}/freedroid.
- Previous message: rpms/fwbackups/devel .cvsignore, 1.5, 1.6 fwbackups.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message: rpms/roundup/devel .cvsignore, 1.2, 1.3 README.Fedora, 1.1, 1.2 roundup.spec, 1.7, 1.8 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list