From: <mal...@us...> - 2010-12-29 07:47:44
|
Revision: 6654 http://exult.svn.sourceforge.net/exult/?rev=6654&view=rev Author: malignantmanor Date: 2010-12-29 07:47:38 +0000 (Wed, 29 Dec 2010) Log Message: ----------- * /objs/eggs.cc: Fix SS stairs so they autoreset. (Bug 3115182) * /mapedit/studio.cc: Fix typo that messed up -p command line. Modified Paths: -------------- exult/trunk/ChangeLog exult/trunk/mapedit/studio.cc exult/trunk/objs/egg.cc Modified: exult/trunk/ChangeLog =================================================================== --- exult/trunk/ChangeLog 2010-12-29 05:52:26 UTC (rev 6653) +++ exult/trunk/ChangeLog 2010-12-29 07:47:38 UTC (rev 6654) @@ -1,3 +1,7 @@ +2010-12-29 Malignant Manor <mal...@us...> + * /objs/eggs.cc: Fix SS stairs so they autoreset. Bug 3115182 + * /mapedit/studio.cc: Fix typo that messed up -p command line. + 2010-12-28 Malignant Manor <mal...@us...> * /mapedit/exult_studio.glade: Fix swapped neutral and friendly alignment display in monster eggs and monster info. Modified: exult/trunk/mapedit/studio.cc =================================================================== --- exult/trunk/mapedit/studio.cc 2010-12-29 05:52:26 UTC (rev 6653) +++ exult/trunk/mapedit/studio.cc 2010-12-29 07:47:38 UTC (rev 6654) @@ -1,5 +1,5 @@ /* -Copyright (C) 2000-2001 The Exult Team +Copyright (C) 2000-2010 The Exult Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -535,7 +535,7 @@ string game = ""; // Game to look up in .exult.cfg. string modtitle = ""; // Mod title to look up in <MODS>/*.cfg. string alt_cfg = ""; - static const char *optstring = "c:g:x:m:p:"; + static const char *optstring = "c:g:x:m:p"; extern int opterr/*, optind, optopt*/; extern char *optarg; opterr = 0; // Don't let getopt() print errs. Modified: exult/trunk/objs/egg.cc =================================================================== --- exult/trunk/objs/egg.cc 2010-12-29 05:52:26 UTC (rev 6653) +++ exult/trunk/objs/egg.cc 2010-12-29 07:47:38 UTC (rev 6654) @@ -1,6 +1,6 @@ /* * Copyright (C) 1998-1999 Jeffrey S. Freedman - * Copyright (C) 2000-2003 The Exult Team + * Copyright (C) 2000-2010 The Exult Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1035,6 +1035,17 @@ if (GAME_SI && eggpos.tx == 1287 && eggpos.ty == 2568 && eggpos.tz == 0) { flags &= ~(1 << (int) hatched); } + // Fixing some stairs in SS bug # 3115182 by making them auto_reset + if (GAME_SS && type == teleport && + ((eggpos.tx == 2844 && eggpos.ty == 2934 && eggpos.tz == 2) || + (eggpos.tx == 2843 && eggpos.ty == 2934 && eggpos.tz == 1) || + (eggpos.tx == 3015 && eggpos.ty == 2840 && eggpos.tz == 0) || + (eggpos.tx == 2950 && eggpos.ty == 2887 && eggpos.tz == 0) || + (eggpos.tx == 2859 && eggpos.ty == 3048 && eggpos.tz == 2) || + (eggpos.tx == 2884 && eggpos.ty == 3047 && eggpos.tz == 2) || + (eggpos.tx == 2983 && eggpos.ty == 2887 && eggpos.tz == 0))) + flags |= (1 << (int) auto_reset); + /* end hack */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |