This commit is contained in:
j3d1 2016-10-06 05:10:30 +02:00
parent a92e7da0f8
commit fb73ec7c7f
2 changed files with 10 additions and 6 deletions

View file

@ -40,7 +40,7 @@ int main(int argc, char *argv[])
{"autorun", required_argument, 0, 'a'}, {"autorun", required_argument, 0, 'a'},
{"port", required_argument, 0, 'p'}, {"port", required_argument, 0, 'p'},
{"sound", no_argument, 0, 's'}, {"sound", no_argument, 0, 's'},
{"fps", no_argument, 0, 'f'}, {"fullscreen",no_argument, 0, 'f'},
{"dev", no_argument, 0, 'd'}, {"dev", no_argument, 0, 'd'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
switch (c) switch (c)
{ {
case 'f': case 'f':
SET_FLAG(SHOW_FPS,true); SET_FLAG(FULLSCREEN,true);
break; break;
case 'd': case 'd':
@ -100,8 +100,13 @@ int main(int argc, char *argv[])
asio::io_service io_service; asio::io_service io_service;
Server s(io_service, game.state(), atoi(port) ); Server s(io_service, game.state(), atoi(port) );
//GameWindow window(500, 500, &game); int x,y;
GameWindow window(500, 500, &game); if(ISSET_FLAG(FULLSCREEN)){
x=1920,y=1080;
}else{
x=800,y=600;
}
GameWindow window(x, y, &game);
window.set_maxfps(60.0); window.set_maxfps(60.0);
window.open(); window.open();

View file

@ -1,8 +1,7 @@
#pragma once #pragma once
#define TEST_FLAG1 0 #define FULLSCREEN 0
#define SHOW_FPS 1 #define SHOW_FPS 1
#define TEST_FLAG2 2
#define TEST_AUTORUN 3 #define TEST_AUTORUN 3
//... //...