teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename LUNATIC_ENABLE macro to just LUNATIC.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2721 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-06-03 15:45:59 +00:00
parent f3c009b146
commit ae15643a73
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/Makefile
View file

@ -152,7 +152,7 @@ ifneq (0,$(LUNATIC))
else else
OURCFLAGS+= -I/usr/local/include/luajit-2.0 OURCFLAGS+= -I/usr/local/include/luajit-2.0
endif endif
OURCFLAGS+= -I$(SRC)/lunatic -DLUNATIC_ENABLE OURCFLAGS+= -I$(SRC)/lunatic -DLUNATIC
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
LIBS+= -LWindows/lib -lluajit LIBS+= -LWindows/lib -lluajit

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

@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "demo.h" #include "demo.h"
#include "common.h" #include "common.h"
#ifdef LUNATIC_ENABLE #ifdef LUNATIC
# include "lunatic.h" # include "lunatic.h"
#endif #endif
@ -167,7 +167,7 @@ char **g_clipMapFiles = NULL;
int32_t g_clipMapFilesNum = 0; int32_t g_clipMapFilesNum = 0;
#endif #endif
#ifdef LUNATIC_ENABLE #ifdef LUNATIC
El_State g_ElState; El_State g_ElState;
#endif #endif
@ -10482,7 +10482,7 @@ CLEAN_DIRECTORY:
OSD_Exec("autoexec.cfg"); OSD_Exec("autoexec.cfg");
#ifdef LUNATIC_ENABLE #ifdef LUNATIC
i = El_CreateState(&g_ElState, "test"); i = El_CreateState(&g_ElState, "test");
if (i) if (i)
{ {

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

@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "osd.h" #include "osd.h"
#include "menus.h" #include "menus.h"
#ifdef LUNATIC_ENABLE #ifdef LUNATIC
# include "lunatic.h" # include "lunatic.h"
extern El_State g_ElState; // this needs to go into a header sometime extern El_State g_ElState; // this needs to go into a header sometime
#endif #endif
@ -96,7 +96,7 @@ void VM_ScriptInfo(void)
// May recurse, e.g. through EVENT_XXX -> ... -> EVENT_KILLIT // May recurse, e.g. through EVENT_XXX -> ... -> EVENT_KILLIT
int32_t VM_OnEvent(int32_t iEventID, int32_t iActor, int32_t iPlayer, int32_t lDist, int32_t iReturn) int32_t VM_OnEvent(int32_t iEventID, int32_t iActor, int32_t iPlayer, int32_t lDist, int32_t iReturn)
{ {
#ifdef LUNATIC_ENABLE #ifdef LUNATIC
if (El_IsInitialized(&g_ElState)) if (El_IsInitialized(&g_ElState))
El_CallEvent(&g_ElState, iEventID); El_CallEvent(&g_ElState, iEventID);
#endif #endif

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

@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef LUNATIC_ENABLE #ifdef LUNATIC
# include "lunatic.h" # include "lunatic.h"
extern El_State g_ElState; extern El_State g_ElState;
#endif #endif
@ -1450,7 +1450,7 @@ static inline void prelevel(char g)
} }
} }
#ifdef LUNATIC_ENABLE #ifdef LUNATIC
if (El_IsInitialized(&g_ElState)) if (El_IsInitialized(&g_ElState))
{ {
i = El_RunOnce(&g_ElState, "test.elua"); i = El_RunOnce(&g_ElState, "test.elua");