[cadcdev-svn-commits] SF.net SVN: cadcdev: [473] tiki

[<at...@us...>]

Revision: 473
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=473&view=rev
Author:   atani
Date:     2007-08-16 15:39:10 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
properly exclude .svn from tar files
fix assert when ansi code goes over the 80x25 screen size (allows rendering to col 80)

Modified Paths:
--------------
    tiki/gp2x/Makefile
    tiki/sdl/Makefile
    tiki/src/gl/drawables/console.cpp

Modified: tiki/gp2x/Makefile
===================================================================
--- tiki/gp2x/Makefile	2007-08-16 19:05:47 UTC (rev 472)
+++ tiki/gp2x/Makefile	2007-08-16 22:39:10 UTC (rev 473)
@@ -65,13 +65,14 @@
 		gp2x/include \
 		gp2x/lib \
 		gp2x/Makefile.rules \
-		--exclude "*/.svn/*"
+		--exclude .svn
 	cp ../examples/console/TikiSnake/resources/pc-ascii.png \
 		../examples/console/TikiSnake
 	tar -uvf ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-gp2x.tar -C ../ \
 		examples/TikiTest/tikitest \
 		examples/console/TikiSnake/tikisnake \
-		examples/console/TikiSnake/pc-ascii.png --exclude "*/.svn/*"
+		examples/console/TikiSnake/pc-ascii.png \
+		--exclude .svn
 	rm -f ../examples/console/TikiSnake/pc-ascii.png
 	gzip ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-gp2x.tar
 

Modified: tiki/sdl/Makefile
===================================================================
--- tiki/sdl/Makefile	2007-08-16 19:05:47 UTC (rev 472)
+++ tiki/sdl/Makefile	2007-08-16 22:39:10 UTC (rev 473)
@@ -64,13 +64,14 @@
 		include \
 		sdl/include \
 		sdl/Makefile.rules \
-		--exclude "*/.svn/*"
+		--exclude .svn
 	cp ../examples/console/TikiSnake/resources/pc-ascii.png \
 		../examples/console/TikiSnake
 	tar -uvf ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar -C ../ \
 		examples/TikiTest/tikitest \
 		examples/console/TikiSnake/tikisnake \
-		examples/console/TikiSnake/pc-ascii.png --exclude "*/.svn/*"
+		examples/console/TikiSnake/pc-ascii.png \
+		--exclude .svn
 	rm -f ../examples/console/TikiSnake/pc-ascii.png
 	gzip ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar
 

Modified: tiki/src/gl/drawables/console.cpp
===================================================================
--- tiki/src/gl/drawables/console.cpp	2007-08-16 19:05:47 UTC (rev 472)
+++ tiki/src/gl/drawables/console.cpp	2007-08-16 22:39:10 UTC (rev 473)
@@ -81,7 +81,7 @@
 }
 
 void ConsoleText::scroll(int rows, int top, int left, int bottom, int right) {
-	assert(top >= 0 && left >= 0 && bottom < m_rows && right < m_cols);
+	assert(top >= 0 && left >= 0 && bottom <= m_rows && right <= m_cols);
 	
 	for(int y=top; y<=bottom; y++) {
 		for(int x=left; x<=right; x++) {
@@ -166,7 +166,7 @@
 		        continue;
 		      }
 			
-			assert(m_cursor_x >= 0 && m_cursor_y >= 0 && m_cursor_x < m_cols && m_cursor_y < m_rows);
+			assert(m_cursor_x >= 0 && m_cursor_y >= 0 && m_cursor_x <= m_cols && m_cursor_y <= m_rows);
 			
 			m_charData[(m_cursor_y * m_cols) + m_cursor_x] = buf[i];
 			m_colorData[(m_cursor_y * m_cols) + m_cursor_x] = m_attr;


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