[Scummvm-cvs-logs] CVS: scummvm/sword2 maketext.cpp,1.31,1.32 module.mk,1.7,1.8

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv5822

Modified Files:
	maketext.cpp module.mk 
Log Message:
More cleanup. Another unused file bites the dust.


Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- maketext.cpp	19 Nov 2003 18:40:52 -0000	1.31
+++ maketext.cpp	25 Nov 2003 07:35:52 -0000	1.32
@@ -405,11 +405,7 @@
 	while (j < MAX_text_blocs && _blocList[j].text_mem)
 		j++;
 
-#ifdef _SWORD2_DEBUG
-	// we've run out - might as well stop the system
-	if (j == MAX_text_blocs)
-		error("Build_new_block ran out of blocks!");
-#endif
+	assert(j < MAX_text_blocs);
 
 	// make the sprite!
 	_blocList[j].text_mem = makeTextSprite(ascii, width, pen, fontRes);

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/module.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- module.mk	18 Nov 2003 08:17:36 -0000	1.7
+++ module.mk	25 Nov 2003 07:35:52 -0000	1.8
@@ -30,7 +30,6 @@
 	sword2/driver/d_draw.o \
 	sword2/driver/d_sound.o \
 	sword2/driver/keyboard.o \
-	sword2/driver/language.o \
 	sword2/driver/menu.o \
 	sword2/driver/_mouse.o \
 	sword2/driver/palette.o \