More MacOSX workaround

master
bzt 2019-12-18 12:17:47 +01:00
parent 5c17d48545
commit 85b52d012f
5 changed files with 3 additions and 1 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -169,6 +169,8 @@ int main(int argc, char** argv, char** envp)
/* MacOSX does not allow specifying arguments when started from Launchpad,
* and it won't show the output in a terminal either. So fake home dir. */
if(argc < 2 && !isatty(1)) { argc++; argv[1] = "~"; }
/* Instead MacOSX likes to append unwanted arguments to the command line... */
if(argc == 2 && !memcmp(argv[1], "-psn_", 5)) argv[1] = "~";
#endif
if(argc < 2) {

View File

@ -230,7 +230,7 @@ void m3d_load(unsigned char *data, unsigned int size)
if(c) tr[i] = color2blockid(c);
else tr[i] = 0;
tr[i] |= s[0] << 24;
s++;
s += 2;
}
/* pick the node palette which has the most node reference */
for(i = savepal = 0; i < numpalettes; i++)