kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

blenderplayer commandline argument fixes (for -f and -w)

Browse Source 
argc always include the filename, therefore all the optional parameters should check for < argc instead of <=argc.

E.g. That was causing "blenderplayer -f 800 600 myfile.blend" to play in a wrong  Bpp (since it was trying to parse the filename to fullScreenBpp).

Bug introduced on rev. 16448 (in 2.49) and merged to 2.5 in rev. 19323
This commit is contained in:
Dalai Felinto 2010-09-13 04:52:20 +00:00
parent 7c9bf53bf1
commit 9153e82d21
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
View File

@ -479,14 +479,14 @@ int main(int argc, char** argv)
i++;
fullScreen = true;
fullScreenParFound = true;
if ((i + 2) <= argc && argv[i][0] != '-' && argv[i+1][0] != '-')
if ((i + 2) < argc && argv[i][0] != '-' && argv[i+1][0] != '-')
{
fullScreenWidth = atoi(argv[i++]);
fullScreenHeight = atoi(argv[i++]);
if ((i + 1) <= argc && argv[i][0] != '-')
if ((i + 1) < argc && argv[i][0] != '-')
{
fullScreenBpp = atoi(argv[i++]);
if ((i + 1) <= argc && argv[i][0] != '-')
if ((i + 1) < argc && argv[i][0] != '-')
fullScreenFrequency = atoi(argv[i++]);
}
}
@ -497,11 +497,11 @@ int main(int argc, char** argv)
fullScreen = false;
windowParFound = true;
if ((i + 2) <= argc && argv[i][0] != '-' && argv[i+1][0] != '-')
if ((i + 2) < argc && argv[i][0] != '-' && argv[i+1][0] != '-')
{
windowWidth = atoi(argv[i++]);
windowHeight = atoi(argv[i++]);
if ((i +2) <= argc && argv[i][0] != '-' && argv[i+1][0] != '-')
if ((i + 2) < argc && argv[i][0] != '-' && argv[i+1][0] != '-')
{
windowLeft = atoi(argv[i++]);
windowTop = atoi(argv[i++]);