mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 17:10:36 +00:00
Code Issues Releases Wiki Activity

some extra commandline options

Browse Source
This commit is contained in:
Zeno Rogue 2017-12-14 02:50:28 +01:00
parent 1a845e0c3f
commit 6635810f35
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
basegraph.cpp
View File

@ -55,9 +55,12 @@ int qpixel3(SDL_Surface *surf, int x, int y) {
#endif #endif
#if CAP_SDLTTF #if CAP_SDLTTF
string fontpath = ISWEB ? "sans-serif" : HYPERPATH "DejaVuSans-Bold.ttf";
void loadfont(int siz) { void loadfont(int siz) {
if(!font[siz]) { if(!font[siz]) {
font[siz] = TTF_OpenFont(ISWEB ? "sans-serif" : HYPERPATH "DejaVuSans-Bold.ttf", siz); font[siz] = TTF_OpenFont(fontpath.c_str(), siz);
// Destination set by ./configure (in the GitHub repository) // Destination set by ./configure (in the GitHub repository)
#ifdef FONTDESTDIR #ifdef FONTDESTDIR
if (font[siz] == NULL) { if (font[siz] == NULL) {
@ -65,7 +68,7 @@ void loadfont(int siz) {
} }
#endif #endif
if (font[siz] == NULL) { if (font[siz] == NULL) {
printf("error: Font file not found\n"); printf("error: Font file not found: %s\n", fontpath.c_str());
exit(1); exit(1);
} }
} }

7
commandline.cpp
View File

@ -67,6 +67,7 @@ int arg::readCommon() {
else if(argis("-lev")) { shift(); levelfile = args(); } else if(argis("-lev")) { shift(); levelfile = args(); }
else if(argis("-pic")) { shift(); picfile = args(); } else if(argis("-pic")) { shift(); picfile = args(); }
else if(argis("-load")) { PHASE(3); shift(); mapstream::loadMap(args()); } else if(argis("-load")) { PHASE(3); shift(); mapstream::loadMap(args()); }
else if(argis("-font")) { PHASE(1); shift(); fontpath = args(); }
else if(argis("-picload")) { PHASE(3); shift(); mapeditor::loadPicFile(args()); } else if(argis("-picload")) { PHASE(3); shift(); mapeditor::loadPicFile(args()); }
#endif #endif
else if(argis("-canvas")) { else if(argis("-canvas")) {
@ -302,6 +303,12 @@ else if(args()[0] == '-' && args()[1] == x && args()[2] == '0') { showstartmenu
else if(argis("--run")) { else if(argis("--run")) {
PHASE(3); mainloop(); quitmainloop = false; PHASE(3); mainloop(); quitmainloop = false;
} }
else if(argis("--msg")) {
shift(); addMessage(args());
}
else if(argis("--msg0")) {
clearMessages();
}
#if CAP_TOUR #if CAP_TOUR
else if(argis("--tour")) { else if(argis("--tour")) {
PHASE(3); tour::start(); PHASE(3); tour::start();