[Stratagus-CVS] stratagus/src/editor editloop.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/20 00:04:25

Modified files:
        src/editor     : editloop.c 

Log message:
        Fixed bug loading editor.lua

Patches:
Index: stratagus/src/editor/editloop.c
diff -u stratagus/src/editor/editloop.c:1.144 
stratagus/src/editor/editloop.c:1.145
--- stratagus/src/editor/editloop.c:1.144       Tue Nov 18 01:58:02 2003
+++ stratagus/src/editor/editloop.c     Thu Nov 20 00:04:25 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: editloop.c,v 1.144 2003/11/18 06:58:02 nehalmistry Exp $
+//     $Id: editloop.c,v 1.145 2003/11/20 05:04:25 jsalmon3 Exp $
 
 //@{
 
@@ -1844,15 +1844,12 @@
        if ((s = strrchr(file, '.')) && s[1] == 'C') {
            fast_load(gh_str02scm(file), NIL);
        } else {
-#if defined(USE_GUILE) || defined(USE_SIOD)
            vload(file, 0, 1);
-#elif defined(USE_LUA)
-           LuaLoadFile(file);
-#endif
        }
-       CclGarbageCollect(0);           // Cleanup memory after load
 #elif defined(USE_LUA)
+       LuaLoadFile(file);
 #endif
+       CclGarbageCollect(0);           // Cleanup memory after load
     }
 
     ThisPlayer = &Players[0];