archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-23 15:59:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	premake5.lua
This commit is contained in:
Sergeanur
2021-07-03 16:39:22 +03:00
parent dd790b00e5 3ed4cdf109
commit 5d5e0f62e8
18 changed files with 152 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/skel/glfw/glfw.cpp
View File

@ -919,7 +919,7 @@ void _InputInitialiseJoys()
free(db);
fclose(f);
} else
printf("You don't seem to have copied " SDL_GAMEPAD_DB_PATH " file from re3/gamefiles to GTA3 directory. Some gamepads may not be recognized.\n");
printf("You don't seem to have copied " SDL_GAMEPAD_DB_PATH " file from reVC/gamefiles to GTA: Vice City directory. Some gamepads may not be recognized.\n");
#undef SDL_GAMEPAD_DB_PATH

4
src/skel/win/win.cpp
View File

@ -1498,7 +1498,7 @@ psSelectDevice()
#ifdef DEFAULT_NATIVE_RESOLUTION
GcurSelVM = 1;
#else
MessageBox(nil, "Cannot find 640x480 video mode", "GTA3", MB_OK);
MessageBox(nil, "Cannot find 640x480 video mode", "GTA: Vice City", MB_OK);
return FALSE;
#endif
}
@ -1541,7 +1541,7 @@ psSelectDevice()
}
if(bestFsMode < 0){
MessageBox(nil, "Cannot find desired video mode", "GTA3", MB_OK);
MessageBox(nil, "Cannot find desired video mode", "GTA: Vice City", MB_OK);
return FALSE;
}
GcurSelVM = bestFsMode;