vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'next' into skybox-hotfix

Browse source
This commit is contained in:
Alam Ed Arias 2016-03-25 18:45:00 -04:00
parent d82c9a66db a567ce8e8e
commit 5945b8f16c
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
comptime.bat
View file

@ -1,4 +1,4 @@
@ECHO OFF @echo off
set BRA=Unknown set BRA=Unknown
set REV=illegal set REV=illegal
@ -13,20 +13,20 @@ goto filwri
:gitrev :gitrev
set GIT=%2 set GIT=%2
if "%GIT%"=="" set GIT=git if "%GIT%"=="" set GIT=git
FOR /F "usebackq" %%s IN (`%GIT% rev-parse --abbrev-ref HEAD`) DO @SET BRA=%%s for /f "usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s
FOR /F "usebackq" %%s IN (`%GIT% rev-parse HEAD`) DO @SET REV=%%s for /f "usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s
set REV=%REV:~0,8% set REV=%REV:~0,8%
goto filwri goto filwri
:svnrev :svnrev
set BRA=Subversion set BRA=Subversion
FOR /F "usebackq" %%s IN (`svnversion .`) DO @SET REV=%%s for /f "usebackq" %%s in (`svnversion .`) do @set REV=%%s
set REV=r%REV% set REV=r%REV%
goto filwri goto filwri
:filwri :filwri
ECHO // Do not edit! This file was autogenerated > %1\comptime.h echo // Do not edit! This file was autogenerated > %1\comptime.h
ECHO // by the %0 batch file >> %1\comptime.h echo // by the %0 batch file >> %1\comptime.h
ECHO // >> %1\comptime.h echo // >> %1\comptime.h
ECHO const char* compbranch = "%BRA%"; >> %1\comptime.h echo const char* compbranch = "%BRA%"; >> %1\comptime.h
ECHO const char* comprevision = "%REV%"; >> %1\comptime.h echo const char* comprevision = "%REV%"; >> %1\comptime.h

6
src/Makefile
View file

@ -262,9 +262,7 @@ else
OBJS+=$(OBJDIR)/hw3sound.o OBJS+=$(OBJDIR)/hw3sound.o
endif endif
ifndef NOVERSION
OPTS += -DCOMPVERSION OPTS += -DCOMPVERSION
endif
ifndef NONX86 ifndef NONX86
ifndef GCC29 ifndef GCC29
@ -551,15 +549,11 @@ cleandep:
$(REMOVE) comptime.h $(REMOVE) comptime.h
pre-build: pre-build:
ifdef NOVERSION
-@touch comptime.c
else
ifdef WINDOWSHELL ifdef WINDOWSHELL
-..\comptime.bat . -..\comptime.bat .
else else
-@../comptime.sh . -@../comptime.sh .
endif endif
endif
clean: clean:
$(REMOVE) *~ *.flc $(REMOVE) *~ *.flc

2
src/d_main.c
View file

@ -513,7 +513,6 @@ static void D_Display(void)
// ========================================================================= // =========================================================================
tic_t rendergametic; tic_t rendergametic;
boolean supdate;
void D_SRB2Loop(void) void D_SRB2Loop(void)
{ {
@ -604,7 +603,6 @@ void D_SRB2Loop(void)
// Update display, next frame, with current state. // Update display, next frame, with current state.
D_Display(); D_Display();
supdate = false;
if (moviemode) if (moviemode)
M_SaveFrame(); M_SaveFrame();

1
src/d_main.h
View file

@ -17,7 +17,6 @@
#include "d_event.h" #include "d_event.h"
#include "w_wad.h" // for MAX_WADFILES #include "w_wad.h" // for MAX_WADFILES
extern boolean supdate;
extern boolean advancedemo; extern boolean advancedemo;
// make sure not to write back the config until it's been correctly loaded // make sure not to write back the config until it's been correctly loaded