zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@804 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-06-14 09:25:22 +00:00
parent 2a78af4558
commit 03b98ea54c
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/build/Makefile
View file

@ -26,7 +26,7 @@ BUILD32_ON_64 ?= 0
# RELEASE - 1 = no debugging # RELEASE - 1 = no debugging
# EFENCE - 1 = compile with Electric Fence for malloc() debugging # EFENCE - 1 = compile with Electric Fence for malloc() debugging
RELEASE?=1 RELEASE?=1
LEVEL3?=0 OPTLEVEL?=2
EFENCE?=0 EFENCE?=0
# SDK locations - adjust to match your setup # SDK locations - adjust to match your setup
@ -47,11 +47,7 @@ asm=nasm
# debugging and release # debugging and release
ifneq (0,$(RELEASE)) ifneq (0,$(RELEASE))
# debugging disabled # debugging disabled
ifeq (1,$(LEVEL3)) debug=-fomit-frame-pointer -O$(OPTLEVEL)
debug=-fomit-frame-pointer -O3
else
debug=-fomit-frame-pointer -O2
endif
else else
# debugging enabled # debugging enabled
debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE

10
polymer/eduke32/Makefile
View file

@ -17,7 +17,7 @@ BUILD32_ON_64 = 0
RELEASE?=1 RELEASE?=1
NOSOUND?=0 NOSOUND?=0
USE_OPENAL?=1 USE_OPENAL?=1
LEVEL3?=0 OPTLEVEL?=2
# build locations # build locations
@ -31,11 +31,7 @@ o=o
ifneq (0,$(RELEASE)) ifneq (0,$(RELEASE))
# debugging disabled # debugging disabled
ifeq (1,$(LEVEL3)) debug=-fomit-frame-pointer -O$(OPTLEVEL)
debug=-fomit-frame-pointer -O3
else
debug=-fomit-frame-pointer -O2
endif
else else
# debugging enabled # debugging enabled
debug=-ggdb -O0 -DDEBUGGINGAIDS debug=-ggdb -O0 -DDEBUGGINGAIDS
@ -228,7 +224,7 @@ enginelib editorlib:
$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \ $(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \ SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \ USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \
NOASM=$(NOASM) RELEASE=$(RELEASE) LEVEL3=$(LEVEL3) $@ NOASM=$(NOASM) RELEASE=$(RELEASE) OPTLEVEL=$(OPTLEVEL) $@
$(EOBJ)/$(ENGINELIB): enginelib $(EOBJ)/$(ENGINELIB): enginelib
$(EOBJ)/$(EDITORLIB): editorlib $(EOBJ)/$(EDITORLIB): editorlib

10
polymer/eduke32/source/game.c
View file

@ -54,7 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h> #include <windows.h>
#include <shellapi.h> #include <shellapi.h>
extern int getversionfromwebsite(char *buffer); extern int getversionfromwebsite(char *buffer);
#define BUILDDATE 20080401 #define BUILDDATE 20080612
#define UPDATEINTERVAL 604800 // 1w #define UPDATEINTERVAL 604800 // 1w
#endif #endif
@ -7925,7 +7925,13 @@ static void nonsharedkeys(void)
{ {
CONTROL_ClearButton(gamefunc_Toggle_Crosshair); CONTROL_ClearButton(gamefunc_Toggle_Crosshair);
ud.crosshair = (ud.crosshair==3)?0:ud.crosshair+1; ud.crosshair = (ud.crosshair==3)?0:ud.crosshair+1;
FTA(ud.crosshair?20:21,g_player[screenpeek].ps); if (ud.crosshair)
{
int size[] = { 100, 50, 25 };
Bsprintf(fta_quotes[122],"%s [%d%%]",fta_quotes[20],size[ud.crosshair-1]);
FTA(122,g_player[screenpeek].ps);
}
else FTA(21,g_player[screenpeek].ps);
} }
if (ud.overhead_on && BUTTON(gamefunc_Map_Follow_Mode)) if (ud.overhead_on && BUTTON(gamefunc_Map_Follow_Mode))

4
polymer/eduke32/source/player.c
View file

@ -1897,7 +1897,7 @@ static int animatefist(int gs,int snum)
static int animateknee(int gs,int snum) static int animateknee(int gs,int snum)
{ {
short knee_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8}; static signed char knee_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8};
int looking_arc, pal; int looking_arc, pal;
if (g_player[snum].ps->knee_incs > 11 || g_player[snum].ps->knee_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0; if (g_player[snum].ps->knee_incs > 11 || g_player[snum].ps->knee_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0;
@ -1922,7 +1922,7 @@ static int animateknee(int gs,int snum)
static int animateknuckles(int gs,int snum) static int animateknuckles(int gs,int snum)
{ {
short knuckle_frames[] = {0,1,2,2,3,3,3,2,2,1,0}; static char knuckle_frames[] = {0,1,2,2,3,3,3,2,2,1,0};
int looking_arc, pal; int looking_arc, pal;
if (g_player[snum].ps->knuckle_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0; if (g_player[snum].ps->knuckle_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0;