From d267ae71defc2aa3637af51d70ee88c1403cb2a9 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 5 Jan 2017 05:29:40 +0000
Subject: [PATCH] Lunatic: Fix build, part 10. g_currentFrameRate -->
g_frameRate
git-svn-id: https://svn.eduke32.com/eduke32@5993 1a8010ca-5511-0410-912e-c29ae57300e0
---
polymer/eduke32/source/lunatic/defs.ilua | 4 ++--
polymer/eduke32/source/lunatic/dynsymlist | 2 +-
polymer/eduke32/source/m32vars.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua
index bb46d8bf7..680246a72 100644
--- a/polymer/eduke32/source/lunatic/defs.ilua
+++ b/polymer/eduke32/source/lunatic/defs.ilua
@@ -668,7 +668,7 @@ const int32_t playerswhenstarted;
int16_t g_spriteDeleteQueueSize;
int16_t g_blimpSpawnItems[15];
int32_t g_scriptVersion;
-const int32_t g_currentFrameRate;
+const int32_t g_frameRate;
const int32_t g_currentMenu;
uint16_t g_earthquakeTime;
uint32_t g_moveThingsCount;
@@ -1573,7 +1573,7 @@ function gv_access._get_viewingrange()
end
function gv_access._currentFramerate()
- return ffiC.g_currentFrameRate
+ return ffiC.g_frameRate
end
function gv_access._currentMenu()
diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist
index 649ddd9d4..d10b3b2f1 100644
--- a/polymer/eduke32/source/lunatic/dynsymlist
+++ b/polymer/eduke32/source/lunatic/dynsymlist
@@ -182,7 +182,7 @@ playerswhenstarted;
g_spriteDeleteQueueSize;
g_blimpSpawnItems;
g_scriptVersion;
-g_currentFrameRate;
+g_frameRate;
g_currentMenu;
g_earthquakeTime;
g_moveThingsCount;
diff --git a/polymer/eduke32/source/m32vars.c b/polymer/eduke32/source/m32vars.c
index d53faa384..12b9eca12 100644
--- a/polymer/eduke32/source/m32vars.c
+++ b/polymer/eduke32/source/m32vars.c
@@ -546,7 +546,7 @@ static void Gv_AddSystemVars(void)
Gv_NewVar("viewingrange",(intptr_t)&viewingrange, GAMEVAR_SYSTEM | GAMEVAR_INTPTR | GAMEVAR_READONLY);
Gv_NewVar("yxaspect",(intptr_t)&yxaspect, GAMEVAR_SYSTEM | GAMEVAR_INTPTR | GAMEVAR_READONLY);
-/// Gv_NewVar("framerate",(intptr_t)&g_currentFrameRate, GAMEVAR_SYSTEM | GAMEVAR_INTPTR | GAMEVAR_READONLY);
+/// Gv_NewVar("framerate",(intptr_t)&g_frameRate, GAMEVAR_SYSTEM | GAMEVAR_INTPTR | GAMEVAR_READONLY);
/// Gv_NewVar("display_mirror",(intptr_t)&display_mirror, GAMEVAR_SYSTEM | GAMEVAR_CHARPTR);
Gv_NewVar("randomseed",(intptr_t)&randomseed, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);