X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscroll.c;h=65929b5a9bca125bb8a076b16a0ecef6929f3839;hb=88411d17d209749656f107651bf5647a73bd65ce;hp=4905fecd1e3a81c0304b6672bd7d65a3ab720c37;hpb=db2db5c9765942319a758dc33cba1a9caff3d3a1;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 4905fecd..65929b5a 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,7 +1,29 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 #include "src/lib/dos_kb.h"
 #include "src/lib/mapread.h"
-#include "src/lib/wtest/wtest.c"
-#include "src/lib/planar.c"
+#include "src/lib/wcpu/wcpu.h"
+#include "src/lib/planar.h"
 //====#include "src\lib\ems.c"
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
@@ -63,7 +85,7 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 //#define TRIGGY 9
 
 void main() {
-	size_t oldfreemem=GetFreeSize();
+//++++	size_t oldfreemem=GetFreeSize();
 	/*long emmhandle;
 	long emsavail;
 	char teststr[80];*/
@@ -123,7 +145,7 @@ void main() {
 //----	initMap(&map);
 	mv[0].map = &map;
 	mv[1].map = &map;
-	//mv[2].map = &map;
+	mv[2].map = &map;
 
 	/* draw the tiles */
 	ptr = map.data;
@@ -196,11 +218,11 @@ void main() {
 	/* setup camera and screen~ */
 	screen = modexDefaultPage();
 	screen.width += (TILEWH*2);
-	screen.height += (TILEWH*2)+QUADWH;
+	screen.height += (TILEWH*2);//+QUADWH;
 	mv[0].page = &screen;
 	screen2 = modexNextPage(mv[0].page);
 	mv[1].page = &screen2;
-	screen3 = modexNextPage0(mv[1].page, 352, 200);	//(352*176)+1024 is the remaining amount of memory left wwww
+	screen3 = modexNextPage0(mv[1].page, 320, 240);	//(352*176)+1024 is the remaining amount of memory left wwww
 	//screen3 = modexNextPage0(mv2.page, 320, 192);	//(352*176)+1024 is the remaining amount of memory left wwww
 	mv[2].page = &screen3;
 
@@ -593,8 +615,8 @@ void main() {
 	printf("player.hp: %d", player.hp);	printf("	player.q: %d", player.q);	printf("	player.d: %d\n", player.d);
 	printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]);
 	printf("palette offset:	%d\n", paloffset/3);
-	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
-	printf("Total free: %zu\n", GetFreeSize());
+//++++	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
+//++++	printf("Total free: %zu\n", GetFreeSize());
 	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
 	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
 	printf("Screen: %dx", screen.width);	printf("%d\n", screen.height);
@@ -955,6 +977,6 @@ animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, s
 	//modexClearRegion(top->page, 66, 66, 2, 40, 0);
 	//modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);
 	//turn this off if XT
-	//XTif(detectcpu() > 0) 
+	//XTif(detectcpu() > 0)
 	modexWaitBorder();
 }