zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: Fix build. BUILD_LUNATIC.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5755 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-05-23 04:47:22 +00:00
parent 41e4ffd2bd
commit 5ae7bd99f2
7 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5989,7 +5989,9 @@ static int32_t G_EndOfLevel(void)
void app_crashhandler(void) void app_crashhandler(void)
{ {
G_CloseDemoWrite(); G_CloseDemoWrite();
#if !defined LUNATIC
VM_ScriptInfo(insptr, 64); VM_ScriptInfo(insptr, 64);
#endif
G_GameQuit(); G_GameQuit();
} }

2
polymer/eduke32/source/gamedef.h
View file

@ -51,8 +51,10 @@ extern "C" {
g_numCompilerWarnings++; \ g_numCompilerWarnings++; \
} while (0) } while (0)
#if !defined LUNATIC
extern intptr_t const * insptr; extern intptr_t const * insptr;
extern void VM_ScriptInfo(intptr_t const *ptr, int32_t range); extern void VM_ScriptInfo(intptr_t const *ptr, int32_t range);
#endif
extern hashtable_t h_gamefuncs; extern hashtable_t h_gamefuncs;

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

@ -85,9 +85,9 @@ GAMEEXEC_STATIC void VM_Execute(int32_t loop);
} \ } \
} }
extern void VM_ScriptInfo(intptr_t const *ptr, int32_t range)
{
#if !defined LUNATIC #if !defined LUNATIC
void VM_ScriptInfo(intptr_t const *ptr, int32_t range)
{
if (!script) if (!script)
return; return;
@ -115,11 +115,8 @@ extern void VM_ScriptInfo(intptr_t const *ptr, int32_t range)
initprintf("g_errorLineNum: %d, g_tw: %d\n", g_errorLineNum, g_tw); initprintf("g_errorLineNum: %d, g_tw: %d\n", g_errorLineNum, g_tw);
} }
#else
UNREFERENCED_PARAMETER(ptr);
UNREFERENCED_PARAMETER(range);
#endif
} }
#endif
static void VM_DeleteSprite(int32_t iActor, int32_t iPlayer) static void VM_DeleteSprite(int32_t iActor, int32_t iPlayer)
{ {

2
polymer/eduke32/source/lunatic/control.lua
View file

@ -442,7 +442,7 @@ function _myos(x, y, zoom, tilenum, shade, orientation, pal)
pal = (sect>=0) and sector[sect].floorpal or 0 pal = (sect>=0) and sector[sect].floorpal or 0
end end
ffiC.G_DrawTileGeneric(x, y, zoom, tilenum, shade, orientation, pal) ffiC.VM_DrawTileGeneric(x, y, zoom, tilenum, shade, orientation, pal)
end end
function _inittimer(ticspersec) function _inittimer(ticspersec)

2
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -684,7 +684,7 @@ void P_DoQuote(int32_t q, DukePlayer_t *p);
void P_SetGamePalette(DukePlayer_t *player, uint32_t palid, int32_t set); void P_SetGamePalette(DukePlayer_t *player, uint32_t palid, int32_t set);
void G_AddUserQuote(const char *daquote); void G_AddUserQuote(const char *daquote);
void G_ClearCameraView(DukePlayer_t *ps); void G_ClearCameraView(DukePlayer_t *ps);
void G_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum, void VM_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum,
int32_t shade, int32_t orientation, int32_t p); int32_t shade, int32_t orientation, int32_t p);
void G_InitTimer(int32_t ticspersec); void G_InitTimer(int32_t ticspersec);
void G_GetTimeDate(int32_t *vals); void G_GetTimeDate(int32_t *vals);

2
polymer/eduke32/source/lunatic/dynsymlist
View file

@ -219,7 +219,7 @@ P_DoQuote;
P_SetGamePalette; P_SetGamePalette;
G_AddUserQuote; G_AddUserQuote;
G_ClearCameraView; G_ClearCameraView;
G_DrawTileGeneric; VM_DrawTileGeneric;
G_InitTimer; G_InitTimer;
G_GetTimeDate; G_GetTimeDate;
G_ToggleWallInterpolation; G_ToggleWallInterpolation;

2
polymer/eduke32/source/player.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef player_h_ #ifndef player_h_
#define player_h_ #define player_h_
#include "inv.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif