summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
m---------others/mniip0
-rw-r--r--src/PowderToySDL.cpp6
3 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index ff26755..e5302cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,5 @@ config.log
*.gch
*.pyc
site_scons/site_tools/mfprogram/*.pyc
-site_scons/site_tools/gch/*.pyc \ No newline at end of file
+site_scons/site_tools/gch/*.pyc
+others/*
diff --git a/others/mniip b/others/mniip
new file mode 160000
+Subproject b97cbb01e590b4e16c014e07c5e5dec6b680666
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index 74d8bc5..eeff756 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -293,7 +293,7 @@ int elapsedTime = 0, currentTime = 0, lastTime = 0, currentFrame = 0;
unsigned int lastTick = 0;
float fps = 0, delta = 1.0f, inputScale = 1.0f;
ui::Engine * engine = NULL;
-
+float currentWidth, currentHeight;
void EngineProcess()
{
int frameStart;
@@ -416,7 +416,9 @@ void EngineProcess()
int main(int argc, char * argv[])
{
- float currentWidth = XRES+BARSIZE, currentHeight = YRES+MENUSIZE;
+ currentWidth = XRES+BARSIZE;
+ currentHeight = YRES+MENUSIZE;
+
std::map<std::string, std::string> arguments = readArguments(argc, argv);