Changeset 91:1e162718ec91

Timestamp:

12/05/07 10:57:01 (3 years ago)

Author:

mdoison

Branch:

madcat

convert_revision:

svn:7c786126-522e-0410-a822-d6d8feae56ca/branches/madcat@128

Message:

Merge madcat with eggy beta revision 4

Files:

• Makefile (modified) (10 diffs)
• src/game/g_admin.c (modified) (1 diff)
• src/game/g_main.c (modified) (1 diff)

Makefile

@@ -199 +199 @@
   endif
 
-  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+  OPTIMIZE = -O2 -funroll-loops -fomit-frame-pointer
 
   ifeq ($(ARCH),x86_64)
-    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
+    OPTIMIZE = -O2 -fomit-frame-pointer -funroll-loops \
       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
       -fstrength-reduce
@@ -209 +209 @@
   else
   ifeq ($(ARCH),x86)
-    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+    OPTIMIZE = -O2 -march=i586 -fomit-frame-pointer \
       -funroll-loops -falign-loops=2 -falign-jumps=2 \
       -falign-functions=2 -fstrength-reduce
@@ -320 +320 @@
 
   ifeq ($(ARCH),ppc)
-    OPTIMIZE += -faltivec -O3
+    OPTIMIZE += -faltivec -O2
   endif
   ifeq ($(ARCH),x86)
@@ -365 +365 @@
     $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
 
-  OPTIMIZE += -ffast-math -falign-loops=16
+  OPTIMIZE += -falign-loops=16
 
   ifneq ($(HAVE_VM_COMPILED),true)
@@ -416 +416 @@
   endif
 
-  OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \
+  OPTIMIZE = -O2 -march=i586 -fno-omit-frame-pointer  \
     -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
     -fstrength-reduce
@@ -488 +488 @@
   ifeq ($(ARCH),axp)
     BASE_CFLAGS += -DNO_VM_COMPILED
-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
+    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -funroll-loops \
       -fomit-frame-pointer -fexpensive-optimizations
   else
   ifeq ($(ARCH),x86)
-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
-      -march=pentium -fomit-frame-pointer -pipe -ffast-math \
+    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -mtune=pentiumpro \
+      -march=pentium -fomit-frame-pointer -pipe \
       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
       -funroll-loops -fstrength-reduce
@@ -568 +568 @@
   BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 -mips3 \
     -nostdinc -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED
-  RELEASE_CFLAGS=$(BASE_CFLAGS) -O3
+  RELEASE_CFLAGS=$(BASE_CFLAGS) -O2
   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 
@@ -607 +607 @@
     -pipe -DUSE_ICON $(shell sdl-config --cflags)
 
-  OPTIMIZE = -O3 -ffast-math -funroll-loops
+  OPTIMIZE = -O2 -funroll-loops
 
   ifeq ($(ARCH),sparc)
-    OPTIMIZE = -O3 -ffast-math -falign-loops=2 \
+    OPTIMIZE = -O2 -falign-loops=2 \
       -falign-jumps=2 -falign-functions=2 -fstrength-reduce \
       -mtune=ultrasparc -mv8plus -mno-faster-structs \
@@ -616 +616 @@
   else
   ifeq ($(ARCH),x86)
-    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+    OPTIMIZE = -O2 -march=i586 -fomit-frame-pointer \
       -funroll-loops -falign-loops=2 -falign-jumps=2 \
       -falign-functions=2 -fstrength-reduce
@@ -652 +652 @@
   BASE_CFLAGS=-DNO_VM_COMPILED
   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3
+  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2
 
   SHLIBEXT=so

src/game/g_admin.c

@@ -1774 +1774 @@
       if( damage < 0 ) damage = 0;
     } else {
-      if( g_slapDamage.integer > 100 ) g_slapDamage.integer = 100;
       damage = BG_FindHealthForClass( vic->client->ps.stats[ STAT_PCLASS ] ) *
-        g_slapDamage.integer / 100;
-      if( damage < 1 ) damage = 1;
-    }
-
-    vic->health -= damage;
-    vic->client->ps.stats[ STAT_HEALTH ] = vic->health;
-    vic->lastDamageTime = level.time;
-    if( vic->health <= 0 )
-    {
-      vic->flags |= FL_NO_KNOCKBACK;
-      vic->enemy = &g_entities[ pids[ 0 ] ];
-      vic->die( vic, 0, 0, damage, MOD_SLAP );
-    } else if( vic->pain ) vic->pain( vic, &g_entities[ pids[ 0 ] ], damage );
+        ( g_slapDamage.integer > 100 ? 100 : g_slapDamage.integer ) / 100;
+
+      if( damage < 1 )
+        damage = 1;
+    }
+
+    G_Damage( vic, NULL, NULL, NULL, NULL, damage, DAMAGE_NO_ARMOR, MOD_SLAP );
   }
 

src/game/g_main.c

@@ -320 +320 @@
   { &g_grangerMode, "g_grangerMode", "0", 0, 0, qfalse },
   { &g_repeaterOnReactor, "g_repeaterOnReactor", "1", 0, 0, qfalse },
-  { &g_jetpackLimit, "g_jetpackLimit", "20", 0, 0, qfalse }
+  { &g_jetpackLimit, "g_jetpackLimit", "40", 0, 0, qfalse }
 };