summaryrefslogtreecommitdiffstats
path: root/src/control/SceneEdit.cpp
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-19 13:35:48 +0100
committerwithmorten <morten.with@gmail.com>2021-01-21 03:18:15 +0100
commitac0f759b274368b9424222a392d9f28b73980eb0 (patch)
tree613c034aea3e8a98d9a752954198216ffebce83e /src/control/SceneEdit.cpp
parentfix RWLIBS build without GTA_PS2_STUFF (diff)
downloadre3-ac0f759b274368b9424222a392d9f28b73980eb0.tar
re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.gz
re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.bz2
re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.lz
re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.xz
re3-ac0f759b274368b9424222a392d9f28b73980eb0.tar.zst
re3-ac0f759b274368b9424222a392d9f28b73980eb0.zip
Diffstat (limited to '')
-rw-r--r--src/control/SceneEdit.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index b7623133..0a679ab5 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -69,7 +69,7 @@ static const char* pCommandStrings[] = {
};
#ifdef CHECK_STRUCT_SIZES
-static_assert(ARRAY_SIZE(pCommandStrings) == CSceneEdit::MOVIE_TOTAL_COMMANDS, "Scene edit: not all commands have names");
+re3_static_assert(ARRAY_SIZE(pCommandStrings) == CSceneEdit::MOVIE_TOTAL_COMMANDS, "Scene edit: not all commands have names");
#endif
static int32 NextValidModelId(int32 mi, int32 step)
@@ -329,7 +329,7 @@ void CSceneEdit::Draw(void)
#ifdef FIX_BUGS
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(COMMAND_NAME_X_RIGHT - SHADOW_OFFSET), SCREEN_SCALE_Y(COMMAND_NAME_Y + SHADOW_OFFSET + i * COMMAND_NAME_HEIGHT), wstr);
#else
- CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-COMMAND_NAME_X_RIGHT) + SHADOW_OFFSET, SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-COMMAND_NAME_Y) + SHADOW_OFFSET + i * COMMAND_NAME_HEIGHT), wstr);
+ CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-COMMAND_NAME_X_RIGHT) + SHADOW_OFFSET, SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-COMMAND_NAME_Y) + SHADOW_OFFSET + i * COMMAND_NAME_HEIGHT, wstr);
#endif
if (nCommandDrawn == m_nCurrentCommand)
CFont::SetColor(CRGBA(156, 91, 40, 255));
@@ -338,7 +338,7 @@ void CSceneEdit::Draw(void)
#ifdef FIX_BUGS
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(COMMAND_NAME_X_RIGHT), SCREEN_SCALE_Y(COMMAND_NAME_Y + i * COMMAND_NAME_HEIGHT), wstr);
#else
- CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-COMMAND_NAME_X_RIGHT), SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-COMMAND_NAME_Y) + i * COMMAND_NAME_HEIGHT), wstr);
+ CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-COMMAND_NAME_X_RIGHT), SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-COMMAND_NAME_Y) + i * COMMAND_NAME_HEIGHT, wstr);
#endif
}
}