Daimonin MMORPG

Revision: 6213
          http://daimonin.svn.sourceforge.net/daimonin/?rev=6213&view=rev
Author:   smacky
Date:     2011-04-20 15:43:30 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
Rewrite flex invocation (this one should work on Windows).

Modified Paths:
--------------
    streams/reOrganisation/server/build/CodeBlocks/server/server.cbp

Modified: streams/reOrganisation/server/build/CodeBlocks/server/server.cbp
===================================================================
--- streams/reOrganisation/server/build/CodeBlocks/server/server.cbp	2011-04-20 12:17:23 UTC (rev 6212)
+++ streams/reOrganisation/server/build/CodeBlocks/server/server.cbp	2011-04-20 15:43:30 UTC (rev 6213)
@@ -29,7 +29,7 @@
 					<Add library="winmm" />
 				</Linker>
 				<ExtraCommands>
-					<Add before="../../bin/win32/flex.exe -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
+					<Add before="../../bin/win32/flex.exe -i -o ../../../src/server/loader.c ../../../src/server/loader.l" />
 					<Add after="../../../install/win32/install.bat ..\..\.." />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -52,7 +52,7 @@
 					<Add library="winmm" />
 				</Linker>
 				<ExtraCommands>
-					<Add before="../../bin/win32/flex.exe -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
+					<Add before="../../bin/win32/flex.exe -i -o ../../../src/server/loader.c ../../../src/server/loader.l" />
 					<Add after="../../../install/win32/install.bat ..\..\.." />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -77,7 +77,7 @@
 					<Add library="m" />
 				</Linker>
 				<ExtraCommands>
-					<Add before="flex -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
+					<Add before="flex -i -o ../../../src/server/loader.c ../../../src/server/loader.l" />
 					<Add after="sh ../../../install/linux/install.sh ../../.." />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -98,7 +98,7 @@
 					<Add library="m" />
 				</Linker>
 				<ExtraCommands>
-					<Add before="flex -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
+					<Add before="flex -i -o ../../../src/server/loader.c ../../../src/server/loader.l" />
 					<Add after="sh ../../../install/linux/install.sh ../../.." />
 					<Mode after="always" />
 				</ExtraCommands>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6212
          http://daimonin.svn.sourceforge.net/daimonin/?rev=6212&view=rev
Author:   smacky
Date:     2011-04-20 12:17:23 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
Remove necessity fo dev to build server on Windows.

Modified Paths:
--------------
    streams/reOrganisation/server/build/CodeBlocks/server/server.cbp

Added Paths:
-----------
    streams/reOrganisation/server/build/bin/
    streams/reOrganisation/server/build/bin/win32/
    streams/reOrganisation/server/build/bin/win32/flex.exe

Removed Paths:
-------------
    streams/reOrganisation/dev/

Modified: streams/reOrganisation/server/build/CodeBlocks/server/server.cbp
===================================================================
--- streams/reOrganisation/server/build/CodeBlocks/server/server.cbp	2011-04-20 11:29:40 UTC (rev 6211)
+++ streams/reOrganisation/server/build/CodeBlocks/server/server.cbp	2011-04-20 12:17:23 UTC (rev 6212)
@@ -29,7 +29,7 @@
 					<Add library="winmm" />
 				</Linker>
 				<ExtraCommands>
-					<Add before="../../../../dev/win32/flex.exe -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
+					<Add before="../../bin/win32/flex.exe -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
 					<Add after="../../../install/win32/install.bat ..\..\.." />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -52,7 +52,7 @@
 					<Add library="winmm" />
 				</Linker>
 				<ExtraCommands>
-					<Add before="../../../../dev/win32/flex.exe -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
+					<Add before="../../bin/win32/flex.exe -i -t ../../../src/server/loader.l &gt; ../../../src/server/loader.c" />
 					<Add after="../../../install/win32/install.bat ..\..\.." />
 					<Mode after="always" />
 				</ExtraCommands>

Copied: streams/reOrganisation/server/build/bin/win32/flex.exe (from rev 6210, trunk/dev/win32/flex.exe)
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6211
          http://daimonin.svn.sourceforge.net/daimonin/?rev=6211&view=rev
Author:   smacky
Date:     2011-04-20 11:29:40 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
Remove commented out code which causes problems under Windows for some reason.

Modified Paths:
--------------
    streams/reOrganisation/server/src/server/loader.l

Modified: streams/reOrganisation/server/src/server/loader.l
===================================================================
--- streams/reOrganisation/server/src/server/loader.l	2011-04-20 08:49:51 UTC (rev 6210)
+++ streams/reOrganisation/server/src/server/loader.l	2011-04-20 11:29:40 UTC (rev 6211)
@@ -496,10 +496,7 @@
 ^is_neutral{S}	   SET_OR_CLEAR_FLAG(op, FLAG_IS_NEUTRAL, IVAL);
 ^lifesave{S}	    SET_OR_CLEAR_FLAG(op, FLAG_LIFESAVE, IVAL);
 ^reg_f{S}			SET_OR_CLEAR_FLAG(op, FLAG_FIGHT_HPREG, IVAL);
-^sleep{S}	    {
-			SET_OR_CLEAR_FLAG(op, FLAG_SLEEP, IVAL);
-			/*(LOG(llevDebug," Warning: Object %s has sleep set in arch.\n",op->name);*/
-		    }
+^sleep{S}	    SET_OR_CLEAR_FLAG(op, FLAG_SLEEP, IVAL);
 ^stand_still{S}	    SET_OR_CLEAR_FLAG(op, FLAG_STAND_STILL, IVAL);
 ^random_move{S}	    SET_OR_CLEAR_FLAG(op, FLAG_RANDOM_MOVE, IVAL);
 ^only_attack{S}	    SET_OR_CLEAR_FLAG(op, FLAG_ONLY_ATTACK, IVAL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6210
          http://daimonin.svn.sourceforge.net/daimonin/?rev=6210&view=rev
Author:   smacky
Date:     2011-04-20 08:49:51 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
Be explicit.

Added Paths:
-----------
    streams/reOrganisation/server/DO_NOT_USE/

Removed Paths:
-------------
    streams/reOrganisation/server/make/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6209
          http://daimonin.svn.sourceforge.net/daimonin/?rev=6209&view=rev
Author:   smacky
Date:     2011-04-20 08:46:26 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
Add dev for Windows.

Added Paths:
-----------
    streams/reOrganisation/dev/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6208
          http://daimonin.svn.sourceforge.net/daimonin/?rev=6208&view=rev
Author:   franklinb
Date:     2011-04-20 00:14:59 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
Missed a file when adding an #include.

Modified Paths:
--------------
    trunk/server/src/include/object.h

Modified: trunk/server/src/include/object.h
===================================================================
--- trunk/server/src/include/object.h	2011-04-19 17:47:14 UTC (rev 6207)
+++ trunk/server/src/include/object.h	2011-04-20 00:14:59 UTC (rev 6208)
@@ -62,6 +62,11 @@
  * and cpu to make aligned access of the members, and can (and will) make things smaller
  * and faster - but this depends on compiler & system too.
  */
+
+// This prevents object stacks from being "too big". When an object stack is larger than this it will cause some problems.
+// TODO: Over time, add code to check against this (i.e. prevent /create-ing stacks larger)
+#define MAX_OBJ_NROF 2147483647
+
 typedef struct obj
 {
     /* These variables are not changed by copy_object(): */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.