[SCM] Standalone 3D Game Maker and 3D Game Design program branch, master, updated. debian/2.6+dfsg-2-6-gd4bfb2b

[Scott Howard]

The following commit has been merged in the master branch:
commit d4bfb2b5607dd4ba75376eb53363c56410fb819d
Author: Scott Howard <showard314 at gmail.com>
Date:   Mon Nov 8 10:33:55 2010 -0500

    removing patch files from previous commit

diff --git a/debian/patches/build_fix_bendian.patch b/debian/patches/build_fix_bendian.patch
deleted file mode 100644
index d03a6c3..0000000
--- a/debian/patches/build_fix_bendian.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Fixes a FTBFS on big endian archs
-Origin: http://forum.sandboxgamemaker.com/tracker.php?p=3&t=63
-Bug: 599629
-
-Index: sandboxgamemaker/src/rpggame/rpgio.cpp
-===================================================================
---- sandboxgamemaker.orig/src/rpggame/rpgio.cpp	2010-10-16 13:04:36.588769003 -0400
-+++ sandboxgamemaker/src/rpggame/rpgio.cpp	2010-10-16 13:08:48.072984448 -0400
-@@ -259,7 +259,7 @@
- 					use_armour *arm = (use_armour *) usable;
- 
- 					f->read(&arm->reqs, sizeof(statreq));
--					lilswap(&arm->reqs);
-+					lilswap(&arm->reqs.attrs[0], sizeof(statreq));
- 
- 					arm->slots = f->getlil<int>();
- 					arm->skill = f->getlil<int>();
-@@ -303,7 +303,7 @@
- 		base->mdl = readstring(f);
- 
- 		f->read(&base->base, sizeof(stats));
--		lilswap(&base->base);
-+		lilswap(&base->base.experience, sizeof(stats));
- 
- 		int items = f->getlil<int>();
- 		loopi(items)
-@@ -591,7 +591,7 @@
- 
- 		saveheader hdr;
- 		f->read(&hdr, sizeof(saveheader));
--		lilswap(&hdr);
-+		lilswap(&hdr.version);
- 
- 		if(hdr.version != GAME_VERSION || strncmp(hdr.magic, GAME_MAGICZ, 4))
- 		{
-@@ -881,7 +881,7 @@
- 					use_armour *use = (use_weapon *) item->uses[i];
- 
- 					statreq tmp = use->reqs;
--					lilswap(&tmp);
-+					lilswap(&tmp.attrs[0], sizeof(statreq));
- 					f->write(&tmp, sizeof(tmp));
- 
- 					f->putlil(use->slots);
-@@ -914,7 +914,7 @@
- 		writestring(f, base->mdl);
- 
- 		stats tmp = base->base;
--		lilswap(tmp);
-+		lilswap(&tmp.experience, sizeof(stats));
- 		f->write(&tmp, sizeof(stats));
- 
- 		f->putlil(base->inventory.length());
-@@ -1168,7 +1168,7 @@
- 		memcpy(hdr.magic, GAME_MAGICZ, 4);
- 		hdr.version = GAME_VERSION;
- 
--		lilswap(&hdr);
-+		lilswap(&hdr.version);
- 		f->write(&hdr, sizeof(saveheader));
- 
- 		lastmap = game::curmap;
diff --git a/debian/patches/spelling_errors.patch b/debian/patches/spelling_errors.patch
deleted file mode 100644
index 587b7b5..0000000
--- a/debian/patches/spelling_errors.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Descritpion: Fixing some minor spelling errors
-Author: Scott Howard <showard314 at gmail.com>
-
-Index: sandboxgamemaker/src/rpggame/rpg.cpp
-===================================================================
---- sandboxgamemaker.orig/src/rpggame/rpg.cpp	2010-10-09 09:16:32.000000000 -0400
-+++ sandboxgamemaker/src/rpggame/rpg.cpp	2010-10-09 09:22:01.892797073 -0400
-@@ -212,7 +212,7 @@
- 
- 		transfer = false;
- 
--		//loop in reverse to not erase new queued actions - ie persistant scripts
-+		//loop in reverse to not erase new queued actions - ie persistent scripts
- 		loopvrev(curmap->loadactions)
- 		{
- 			curmap->loadactions[i]->exec();
-@@ -346,6 +346,7 @@
- 	}
- 
- 	void physicstrigger(physent *d, bool local, int floorlevel, int waterlevel, int material)
-+
- 	{
- 		if(d->state!=CS_ALIVE||d->type==ENT_INANIMATE) return;
- 		switch(material)
-Index: sandboxgamemaker/src/rpggame/rpghud.cpp
-===================================================================
---- sandboxgamemaker.orig/src/rpggame/rpghud.cpp	2010-10-09 09:16:39.000000000 -0400
-+++ sandboxgamemaker/src/rpggame/rpghud.cpp	2010-10-09 09:20:57.335306991 -0400
-@@ -166,7 +166,7 @@
- 			draw_textf("curmap: %s", 0, 0, curmap->name);
- 			draw_textf("blips: %i", 0, 50, curmap->blips.length());
- 			draw_textf("objects: %i", 0, 100, curmap->objs.length());
--			draw_textf("persistant effects: %i", 0, 150, curmap->aeffects.length());
-+			draw_textf("persistent effects: %i", 0, 150, curmap->aeffects.length());
- 			draw_textf("projectiles: %i", 0, 200, curmap->projs.length());
- 
- 			draw_textf("scripts: %i", 0, 300, scripts.length());
-@@ -326,4 +326,4 @@
- 		}
- 		return editmode;
- 	}
--}
-\ No newline at end of file
-+}
-Index: sandboxgamemaker/src/rpggame/rpgscript.cpp
-===================================================================
---- sandboxgamemaker.orig/src/rpggame/rpgscript.cpp	2010-10-09 09:16:46.000000000 -0400
-+++ sandboxgamemaker/src/rpggame/rpgscript.cpp	2010-10-09 09:21:21.108369628 -0400
-@@ -688,7 +688,7 @@
- 		if(mapsel != destmap)
- 		{
- 			if(DEBUG_SCRIPT)
--				conoutf(CON_DEBUG, "DEBUG: creature (%p) intermap teleport from %s to %s - transfering", entsel, mapsel->name, destmap->name);
-+				conoutf(CON_DEBUG, "DEBUG: creature (%p) intermap teleport from %s to %s - transferring", entsel, mapsel->name, destmap->name);
- 
- 			//make sure there are no pendings actions for this ent on said map
- 			loopvrev(mapsel->loadactions)
-@@ -717,7 +717,7 @@
- 		}
- 
- 		if(DEBUG_SCRIPT)
--			conoutf(CON_DEBUG, "DEBUG: curmap teleport, transfering creature (%p) to teledest %i", entsel, *d);
-+			conoutf(CON_DEBUG, "DEBUG: curmap teleport, transferring creature (%p) to teledest %i", entsel, *d);
- 
- 		entities::teleport(entsel, *d);
- 	)

-- 
Standalone 3D Game Maker and 3D Game Design program