Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Andraž Levstik (231ac99950f61322c88c362a062c56f6207c4cc5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Andraž Levstik (231ac99950f61322c88c362a062c56f6207c4cc5)
  • Date: Thu, 26 Apr 2007 10:33:56 -0500

GIT changes to master games grimoire by Andraž Levstik <ruskie AT mages.ath.cx>:

games-simulation/searchandrescue/BUILD | 25
games-simulation/searchandrescue/DEPENDS | 26
games-simulation/searchandrescue/DETAILS | 2
games-simulation/searchandrescue/HISTORY | 8
games-simulation/searchandrescue/PRE_BUILD | 21
games-simulation/searchandrescue/namespace-fix.patch | 9
games-simulation/searchandrescue/searchandrescue-0.8.2-gcc41.patch | 669
++++++++++
7 files changed, 724 insertions(+), 36 deletions(-)

New commits:
commit 231ac99950f61322c88c362a062c56f6207c4cc5
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

searchandrescue: fixing bug #12708

diff --git a/games-simulation/searchandrescue/BUILD
b/games-simulation/searchandrescue/BUILD
index 23dd462..005f9c9 100755
--- a/games-simulation/searchandrescue/BUILD
+++ b/games-simulation/searchandrescue/BUILD
@@ -1,13 +1,14 @@
-#
-# FHS
-#
-sedit 's!$(PREFIX)/man!$(PREFIX)/share/man!' sar/Makefile.install.UNIX &&
-
-./configure linux --build=$BUILD \
- --prefix=${INSTALL_ROOT}/usr \
- --datadir=${INSTALL_ROOT}/usr/share/games \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --bindir=${INSTALL_ROOT}/usr/games \
- $OPTS &&
+OPTS="--disable=arch-i486 \
+ --disable=arch-i586 \
+ --disable=arch-i686 \
+ --disable=arch-pentiumpro \
+ $OPTS" &&
+./configure Linux --build=$BUILD \
+ --prefix=${INSTALL_ROOT}/usr \
+ --datadir=${INSTALL_ROOT}/usr/share/games \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --localstatedir=${INSTALL_ROOT}/var/games \
+ --bindir=${INSTALL_ROOT}/usr/games \
+ $OPTS &&
make
diff --git a/games-simulation/searchandrescue/DEPENDS
b/games-simulation/searchandrescue/DEPENDS
index ffa9265..c8b8a70 100755
--- a/games-simulation/searchandrescue/DEPENDS
+++ b/games-simulation/searchandrescue/DEPENDS
@@ -1,9 +1,19 @@
-depends GLUT &&
-optional_depends yiff \
- "" \
- "" \
- "Sound support." &&
-optional_depends libjsw \
- "" \
- "" \
+depends GLUT &&
+depends OPENGL &&
+depends X11-LIBS &&
+depends libxpm &&
+. $GRIMOIRE/FUNCTIONS
+if check_if_xorg_modular_libs ; then
+optional_depends libxxf86vm \
+ "" \
+ "--disable=XF86VidMode" \
+ "Enable XF86VidMode support."
+fi &&
+optional_depends yiff \
+ "" \
+ "--disable=Y2" \
+ "Sound support." &&
+optional_depends libjsw \
+ "" \
+ "--disable=libjsw" \
"Joystick support."
diff --git a/games-simulation/searchandrescue/DETAILS
b/games-simulation/searchandrescue/DETAILS
index 93078b9..6c6e3a4 100755
--- a/games-simulation/searchandrescue/DETAILS
+++ b/games-simulation/searchandrescue/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}

SOURCE2_HASH=sha512:1e4f3287955e4cbec236d81180d592b77ba9cad70d3a840f4ce28ebe6f65eb83c30de5afe1e4615b4212c502a3e83a9d2faae944c288ee0304f8a6b436230bc2
WEB_SITE=http://wolfpack.twu.net/SearchAndRescue
ENTERED=20010922
- UPDATED=20020426
+ PATCHLEVEL=1
LICENSE[0]=GPL
SHORT="3D helicopter game."
cat << EOF
diff --git a/games-simulation/searchandrescue/HISTORY
b/games-simulation/searchandrescue/HISTORY
index fa4831b..11714fb 100644
--- a/games-simulation/searchandrescue/HISTORY
+++ b/games-simulation/searchandrescue/HISTORY
@@ -1,3 +1,11 @@
+2007-04-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * searchandrescue-0.8.2-gcc41.patch: added from gentoo
+ * namespace-fix.patch: removed no longer needed
+ * DETAILS: patchlevel++
+ * PRE_BUILD: fix some missing includes and paths and patch
+ * BUILD: minor fixups
+ * DEPENDS: fixup some depends
+
2006-09-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/games-simulation/searchandrescue/PRE_BUILD
b/games-simulation/searchandrescue/PRE_BUILD
index b4f1898..65faee1 100755
--- a/games-simulation/searchandrescue/PRE_BUILD
+++ b/games-simulation/searchandrescue/PRE_BUILD
@@ -1,6 +1,15 @@
-default_pre_build &&
-mkdir $SOURCE_DIRECTORY/sandr-data &&
-cd $SOURCE_DIRECTORY/sandr-data &&
-unpack_file '2' &&
-patch $SOURCE_DIRECTORY/sar/gctl.c \
- $SCRIPT_DIRECTORY/namespace-fix.patch
+default_pre_build &&
+mkdir -vp $SOURCE_DIRECTORY/sandr-data &&
+cd $SOURCE_DIRECTORY/sandr-data &&
+unpack_file 2 &&
+cd $SOURCE_DIRECTORY &&
+sedit 's:$(PREFIX)/man:$(PREFIX)/share/man:' \
+ sar/Makefile.install.UNIX &&
+sedit '9i#include <string.h>' sar/explosion.c &&
+sedit '9i#include <string.h>' sar/fire.c &&
+sedit '9i#include <string.h>' sar/sardrawmessages.c &&
+sedit '9i#include <string.h>' sar/sardrawrunway.c &&
+sedit '9i#include <stdio.h>' sar/gctl.c &&
+sedit '/extern\ char\ \*tzname\[2\]\;/d' sar/string.cpp &&
+sedit '9i#include <string.h>' sar/sardraw.c &&
+patch -p0 < $SPELL_DIRECTORY/searchandrescue-0.8.2-gcc41.patch
diff --git a/games-simulation/searchandrescue/namespace-fix.patch
b/games-simulation/searchandrescue/namespace-fix.patch
deleted file mode 100644
index 31e8a90..0000000
--- a/games-simulation/searchandrescue/namespace-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur SearchAndRescue-0.8.2.orig/sar/gctl.c
SearchAndRescue-0.8.2/sar/gctl.c
---- SearchAndRescue-0.8.2.orig/sar/gctl.c 2006-03-10 10:38:52.715099336
-0800
-+++ SearchAndRescue-0.8.2/sar/gctl.c 2006-03-10 10:44:12.440493688 -0800
-@@ -1,4 +1,5 @@
- #include <stdlib.h>
-+#include <stdio.h>
- #include <sys/types.h>
- #ifdef JS_SUPPORT
- # include <jsw.h>
diff --git
a/games-simulation/searchandrescue/searchandrescue-0.8.2-gcc41.patch
b/games-simulation/searchandrescue/searchandrescue-0.8.2-gcc41.patch
new file mode 100644
index 0000000..4d89f00
--- /dev/null
+++ b/games-simulation/searchandrescue/searchandrescue-0.8.2-gcc41.patch
@@ -0,0 +1,669 @@
+--- sar/disk.cpp.old 2006-04-08 12:06:34.000000000 +0200
++++ sar/disk.cpp 2006-04-08 12:08:13.000000000 +0200
+@@ -131,11 +131,7 @@
+ return(0);
+
+ // Dan S: typecast is due to const.
+-#if defined(__cplusplus) || defined(c_plusplus)
+- while(ISBLANK(reinterpret_cast<char>(*path)))
+-#else
+ while(ISBLANK(*path))
+-#endif
+ path++;
+
+ return(*path == DIR_DELIMINATOR);
+--- sar/menumap.c.old 2006-04-08 11:41:01.000000000 +0200
++++ sar/menumap.c 2006-04-08 11:41:48.000000000 +0200
+@@ -279,9 +279,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)map = SAR_MENU_MAP(calloc(
++ m->object[n] = SAR_MENU_MAP(calloc(
+ 1, sizeof(sar_menu_map_struct)
+ ));
++ map = (sar_menu_map_struct *)m->object[n];
+ if(map == NULL)
+ return(-1);
+
+--- sar/sarfioopen.c.old 2006-04-08 11:43:53.000000000 +0200
++++ sar/sarfioopen.c 2006-04-08 12:02:13.000000000 +0200
+@@ -270,7 +270,7 @@
+ )
+ {
+ sar_parm_version_struct *pv =
+- (sar_parm_version_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_VERSION
+ );
+
+@@ -295,7 +295,7 @@
+ )
+ {
+ sar_parm_name_struct *pv =
+- (sar_parm_name_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NAME
+ );
+
+@@ -311,7 +311,7 @@
+ )
+ {
+ sar_parm_description_struct *pv =
+- (sar_parm_description_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_DESCRIPTION
+ );
+
+@@ -326,7 +326,7 @@
+ )
+ {
+ sar_parm_player_model_file_struct *pv =
+- (sar_parm_player_model_file_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_PLAYER_MODEL_FILE
+ );
+
+@@ -343,7 +343,7 @@
+ )
+ {
+ sar_parm_weather_struct *pv =
+- (sar_parm_weather_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_WEATHER
+ );
+
+@@ -361,7 +361,7 @@
+ {
+ int h, m, s;
+ sar_parm_time_of_day_struct *pv =
+- (sar_parm_time_of_day_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_TIME_OF_DAY
+ );
+
+@@ -382,7 +382,7 @@
+ )
+ {
+ sar_parm_register_location_struct *pv =
+- (sar_parm_register_location_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_REGISTER_LOCATION
+ );
+
+@@ -418,7 +418,7 @@
+ )
+ {
+ sar_parm_scene_gps_struct *pv =
+- (sar_parm_scene_gps_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_SCENE_GPS
+ );
+
+@@ -440,7 +440,7 @@
+ )
+ {
+ sar_parm_scene_map_struct *pv =
+- (sar_parm_scene_map_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_SCENE_MAP
+ );
+
+@@ -464,7 +464,7 @@
+ )
+ {
+ sar_parm_scene_elevation_struct *pv =
+- (sar_parm_scene_elevation_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_SCENE_ELEVATION
+ );
+
+@@ -480,7 +480,7 @@
+ )
+ {
+ sar_parm_scene_cant_struct *pv =
+- (sar_parm_scene_cant_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_SCENE_CANT
+ );
+
+@@ -496,7 +496,7 @@
+ )
+ {
+ sar_parm_scene_ground_flags_struct *pv =
+- (sar_parm_scene_ground_flags_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_SCENE_GROUND_FLAGS
+ );
+
+@@ -522,7 +522,7 @@
+ )
+ {
+ sar_parm_scene_ground_tile_struct *pv =
+- (sar_parm_scene_ground_tile_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_SCENE_GROUND_TILE
+ );
+
+@@ -560,7 +560,7 @@
+ )
+ {
+ sar_parm_texture_base_directory_struct *pv =
+- (sar_parm_texture_base_directory_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_TEXTURE_BASE_DIRECTORY
+ );
+
+@@ -576,7 +576,7 @@
+ )
+ {
+ sar_parm_texture_load_struct *pv =
+- (sar_parm_texture_load_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_TEXTURE_LOAD
+ );
+
+@@ -605,7 +605,7 @@
+ )
+ {
+ sar_parm_mission_scene_file_struct *pv =
+- (sar_parm_mission_scene_file_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_SCENE_FILE
+ );
+
+@@ -620,7 +620,7 @@
+ )
+ {
+ sar_parm_mission_new_objective_struct *pv =
+- (sar_parm_mission_new_objective_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_NEW_OBJECTIVE
+ );
+
+@@ -660,7 +660,7 @@
+ )
+ {
+ sar_parm_mission_time_left_struct *pv =
+- (sar_parm_mission_time_left_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_TIME_LEFT
+ );
+
+@@ -676,7 +676,7 @@
+ )
+ {
+ sar_parm_mission_begin_at_struct *pv =
+- (sar_parm_mission_begin_at_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_BEGIN_AT
+ );
+
+@@ -695,7 +695,7 @@
+ )
+ {
+ sar_parm_mission_begin_at_pos_struct *pv =
+- (sar_parm_mission_begin_at_pos_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_BEGIN_AT_POS
+ );
+
+@@ -723,7 +723,7 @@
+ )
+ {
+ sar_parm_mission_arrive_at_struct *pv =
+- (sar_parm_mission_arrive_at_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_ARRIVE_AT
+ );
+
+@@ -742,7 +742,7 @@
+ )
+ {
+ sar_parm_mission_message_success_struct *pv =
+- (sar_parm_mission_message_success_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_MESSAGE_SUCCESS
+ );
+
+@@ -761,7 +761,7 @@
+ )
+ {
+ sar_parm_mission_message_fail_struct *pv =
+- (sar_parm_mission_message_fail_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_MESSAGE_FAIL
+ );
+
+@@ -780,7 +780,7 @@
+ )
+ {
+ sar_parm_mission_humans_tally_struct *pv =
+- (sar_parm_mission_humans_tally_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_HUMANS_TALLY
+ );
+
+@@ -810,7 +810,7 @@
+ )
+ {
+ sar_parm_mission_add_intercept_struct *pv =
+- (sar_parm_mission_add_intercept_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MISSION_ADD_INTERCEPT
+ );
+
+@@ -883,7 +883,7 @@
+ )
+ {
+ sar_parm_new_object_struct *pv =
+- (sar_parm_new_object_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NEW_OBJECT
+ );
+
+@@ -901,7 +901,7 @@
+ )
+ {
+ sar_parm_new_helipad_struct *pv =
+- (sar_parm_new_helipad_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NEW_HELIPAD
+ );
+
+@@ -1005,7 +1005,7 @@
+ )
+ {
+ sar_parm_new_runway_struct *pv =
+- (sar_parm_new_runway_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NEW_RUNWAY
+ );
+
+@@ -1108,7 +1108,7 @@
+ )
+ {
+ sar_parm_new_human_struct *pv =
+- (sar_parm_new_human_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NEW_HUMAN
+ );
+
+@@ -1186,7 +1186,7 @@
+ )
+ {
+ sar_parm_new_fire_struct *pv =
+- (sar_parm_new_fire_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NEW_FIRE
+ );
+
+@@ -1211,7 +1211,7 @@
+ )
+ {
+ sar_parm_new_smoke_struct *pv =
+- (sar_parm_new_smoke_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NEW_SMOKE
+ );
+
+@@ -1254,7 +1254,7 @@
+ )
+ {
+ sar_parm_new_premodeled_struct *pv =
+- (sar_parm_new_premodeled_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NEW_PREMODELED
+ );
+
+@@ -1278,7 +1278,7 @@
+ )
+ {
+ sar_parm_select_object_by_name_struct *pv =
+- (sar_parm_select_object_by_name_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_SELECT_OBJECT_BY_NAME
+ );
+
+@@ -1298,7 +1298,7 @@
+ )
+ {
+ sar_parm_model_file_struct *pv =
+- (sar_parm_model_file_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_MODEL_FILE
+ );
+
+@@ -1316,7 +1316,7 @@
+ )
+ {
+ sar_parm_range_struct *pv =
+- (sar_parm_range_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_RANGE
+ );
+
+@@ -1338,7 +1338,7 @@
+ )
+ {
+ sar_parm_range_far_struct *pv =
+- (sar_parm_range_far_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_RANGE_FAR
+ );
+
+@@ -1361,7 +1361,7 @@
+ )
+ {
+ sar_parm_translate_struct *pv =
+- (sar_parm_translate_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_TRANSLATE
+ );
+
+@@ -1382,7 +1382,7 @@
+ )
+ {
+ sar_parm_translate_random_struct *pv =
+- (sar_parm_translate_random_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_TRANSLATE_RANDOM
+ );
+
+@@ -1401,7 +1401,7 @@
+ )
+ {
+ sar_parm_rotate_struct *pv =
+- (sar_parm_rotate_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_ROTATE
+ );
+
+@@ -1421,7 +1421,7 @@
+ )
+ {
+ sar_parm_no_depth_test_struct *pv =
+- (sar_parm_no_depth_test_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_NO_DEPTH_TEST
+ );
+
+@@ -1435,7 +1435,7 @@
+ )
+ {
+ sar_parm_polygon_offset_struct *pv =
+- (sar_parm_polygon_offset_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_POLYGON_OFFSET
+ );
+
+@@ -1481,7 +1481,7 @@
+ )
+ {
+ sar_parm_contact_bounds_spherical_struct *pv =
+- (sar_parm_contact_bounds_spherical_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_CONTACT_BOUNDS_SPHERICAL
+ );
+
+@@ -1503,7 +1503,7 @@
+ )
+ {
+ sar_parm_contact_bounds_cylendrical_struct *pv =
+- (sar_parm_contact_bounds_cylendrical_struct *)p =
SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL
+ );
+
+@@ -1538,7 +1538,7 @@
+ )
+ {
+ sar_parm_contact_bounds_rectangular_struct *pv =
+- (sar_parm_contact_bounds_rectangular_struct *)p =
SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_CONTACT_BOUNDS_RECTANGULAR
+ );
+
+@@ -1589,7 +1589,7 @@
+ )
+ {
+ sar_parm_ground_elevation_struct *pv =
+- (sar_parm_ground_elevation_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_GROUND_ELEVATION
+ );
+
+@@ -1606,7 +1606,7 @@
+ )
+ {
+ sar_parm_object_name_struct *pv =
+- (sar_parm_object_name_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_OBJECT_NAME
+ );
+
+@@ -1627,7 +1627,7 @@
+ )
+ {
+ sar_parm_object_map_description_struct *pv =
+- (sar_parm_object_map_description_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_OBJECT_MAP_DESCRIPTION
+ );
+
+@@ -1645,7 +1645,7 @@
+ )
+ {
+ sar_parm_fuel_struct *pv =
+- (sar_parm_fuel_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_FUEL
+ );
+
+@@ -1670,7 +1670,7 @@
+ )
+ {
+ sar_parm_hitpoints_struct *pv =
+- (sar_parm_hitpoints_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_HITPOINTS
+ );
+
+@@ -1695,7 +1695,7 @@
+ )
+ {
+ sar_parm_engine_state_struct *pv =
+- (sar_parm_engine_state_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_ENGINE_STATE
+ );
+
+@@ -1711,7 +1711,7 @@
+ )
+ {
+ sar_parm_passengers_struct *pv =
+- (sar_parm_passengers_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_PASSENGERS
+ );
+
+@@ -1738,7 +1738,7 @@
+ )
+ {
+ sar_parm_runway_approach_lighting_north_struct *pv =
+- (sar_parm_runway_approach_lighting_north_struct *)p =
SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH
+ );
+
+@@ -1776,7 +1776,7 @@
+ )
+ {
+ sar_parm_runway_approach_lighting_south_struct *pv =
+- (sar_parm_runway_approach_lighting_south_struct *)p =
SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH
+ );
+
+@@ -1815,7 +1815,7 @@
+ )
+ {
+ sar_parm_human_message_enter_struct *pv =
+- (sar_parm_human_message_enter_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_HUMAN_MESSAGE_ENTER
+ );
+
+@@ -1834,7 +1834,7 @@
+ )
+ {
+ sar_parm_human_reference_struct *pv =
+- (sar_parm_human_reference_struct *)p = SARParmNew(
++ p = SARParmNew(
+ SAR_PARM_HUMAN_REFERENCE
+ );
+
+@@ -2030,7 +2030,7 @@
+ if(FILTER_CHECK(SAR_PARM_MISSION_LOG_HEADER))
+ {
+ p_mission_log_header =
+- (sar_parm_mission_log_header_struct *)p =
++ p =
+ SARParmNew(SAR_PARM_MISSION_LOG_HEADER);
+
+ DO_ADD_PARM
+--- sar/menu.c.old 2006-04-08 11:27:14.000000000 +0200
++++ sar/menu.c 2006-04-08 11:40:37.000000000 +0200
+@@ -701,9 +701,8 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)label_ptr = SAR_MENU_LABEL(calloc(
+- 1, sizeof(sar_menu_label_struct)
+- ));
++ m->object[n] = SAR_MENU_LABEL(calloc(1,
sizeof(sar_menu_label_struct)));
++ label_ptr = (sar_menu_label_struct *)m->object[n];
+ if(label_ptr == NULL)
+ return(-3);
+
+@@ -780,9 +779,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)button = SAR_MENU_BUTTON(calloc(
++ m->object[n] = SAR_MENU_BUTTON(calloc(
+ 1, sizeof(sar_menu_button_struct)
+ ));
++ button = (sar_menu_button_struct *)m->object[n];
+ if(button == NULL)
+ return(-3);
+
+@@ -861,9 +861,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)pb = SAR_MENU_PROGRESS(calloc(
++ m->object[n] = SAR_MENU_PROGRESS(calloc(
+ 1, sizeof(sar_menu_progress_struct)
+ ));
++ pb = (sar_menu_progress_struct *)m->object[n];
+ if(pb == NULL)
+ return(-3);
+
+@@ -964,9 +965,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)mesgbox = SAR_MENU_MESSAGE_BOX(calloc(
++ m->object[n] = SAR_MENU_MESSAGE_BOX(calloc(
+ 1, sizeof(sar_menu_message_box_struct)
+ ));
++ mesgbox = (sar_menu_message_box_struct *)m->object[n];
+ if(mesgbox == NULL)
+ return(-3);
+
+@@ -1078,9 +1080,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)list = SAR_MENU_LIST(calloc(
++ m->object[n] = SAR_MENU_LIST(calloc(
+ 1, sizeof(sar_menu_list_struct)
+ ));
++ list = (sar_menu_list_struct *)m->object[n];
+ if(list == NULL)
+ return(-3);
+
+@@ -1326,9 +1329,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)mdpy = SAR_MENU_MDISPLAY(calloc(
++ m->object[n] = SAR_MENU_MDISPLAY(calloc(
+ 1, sizeof(sar_menu_mdisplay_struct)
+ ));
++ mdpy = (sar_menu_mdisplay_struct *)m->object[n];
+ if(mdpy == NULL)
+ return(-3);
+
+@@ -1416,9 +1420,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)sw = SAR_MENU_SWITCH(calloc(
++ m->object[n] = SAR_MENU_SWITCH(calloc(
+ 1, sizeof(sar_menu_switch_struct)
+ ));
++ sw = (sar_menu_switch_struct *)m->object[n];
+ if(sw == NULL)
+ return(-3);
+
+@@ -1556,9 +1561,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)spin = SAR_MENU_SPIN(calloc(
++ m->object[n] = SAR_MENU_SPIN(calloc(
+ 1, sizeof(sar_menu_spin_struct)
+ ));
++ spin = (sar_menu_spin_struct *)m->object[n];
+ if(spin == NULL)
+ return(-3);
+
+@@ -2010,9 +2016,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)slider = SAR_MENU_SLIDER(calloc(
++ m->object[n] = SAR_MENU_SLIDER(calloc(
+ 1, sizeof(sar_menu_slider_struct)
+ ));
++ slider = (sar_menu_slider_struct *)m->object[n];
+ if(slider == NULL)
+ return(-3);
+
+--- sar/menuobjview.c.old 2006-04-08 11:42:14.000000000 +0200
++++ sar/menuobjview.c 2006-04-08 11:43:00.000000000 +0200
+@@ -151,9 +151,10 @@
+ }
+
+ /* Allocate structure */
+- m->object[n] = (void *)objview = SAR_MENU_OBJVIEW(calloc(
++ m->object[n] = SAR_MENU_OBJVIEW(calloc(
+ 1, sizeof(sar_menu_objview_struct)
+ ));
++ objview = (sar_menu_objview_struct *)m->object[n];
+ if(objview == NULL)
+ return(-1);
+
+--- sar/sound.c.old 2006-04-08 12:04:32.000000000 +0200
++++ sar/sound.c 2006-04-08 12:05:57.000000000 +0200
+@@ -230,7 +230,7 @@
+ * YIDNULL.
+ */
+ #define SET_SND_PLAY_YID_NULL(p) \
+- { if((p) != NULL) (snd_play_struct *)(p)->data = (void *)YIDNULL; }
++ { if((p) != NULL) (p)->data = (void *)YIDNULL; }
+
+ if(recorder->con != NULL)
+ {



  • [SM-Commit] GIT changes to master games grimoire by Andraž Levstik (231ac99950f61322c88c362a062c56f6207c4cc5), Andraž Levstik, 04/26/2007

Archive powered by MHonArc 2.6.24.

Top of Page