X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2F16.c;h=380c3359bf7d681dfeeb3e92a4fa1a43088903c0;hb=9fae6d1ef0ebd44690958e072f400edde9262208;hp=fac98bf97290465e1dbcf6e814c38c9db4fc8f9a;hpb=ffd855e814f3aa4f300915ffca12be6f5763e608;p=16.git

diff --git a/src/16.c b/src/16.c
old mode 100644
new mode 100755
index fac98bf9..380c3359
--- a/src/16.c
+++ b/src/16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -22,34 +22,68 @@
 
 #include "src/16.h"
 
+global_game_variables_t gvar;
+engi_stat_t engi_stat;
+const char *cpus;
+byte *dpal, *gpal;
+player_t player[MaxPlayers];
+//page_t screen;
+
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
-	engi_stat_t engi_stat;
-	const char *cpus;
-	byte *dpal, *gpal;
-	player_t player[MaxPlayers];
+	// DOSLIB: check our environment
+	probe_dos();
+
+	// DOSLIB: what CPU are we using?
+	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
+	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
+	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
+	//      the CPU to carry out tasks. --J.C.
+	cpu_probe();
+
+	// DOSLIB: check for VGA
+	if (!probe_vga()) {
+		printf("VGA probe failed\n");
+		return;
+	}
+	// hardware must be VGA or higher!
+	if (!(vga_state.vga_flags & VGA_IS_VGA)) {
+		printf("This program requires VGA or higher graphics hardware\n");
+		return;
+	}
+
+	if (_DEBUG_INIT() == 0) {
+#ifdef DEBUGSERIAL
+		printf("WARNING: Failed to initialize DEBUG output\n");
+#endif
+	}
+	_DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
 
+	//screen = modexDefaultPage();
 	engi_stat = ENGI_RUN;
+	textInit();
 
 	/* save the palette */
 	dpal = modexNewPal();
 	modexPalSave(dpal);
-	modexFadeOff(4, dpal);
+//	modexFadeOff(4, dpal);
 	//printf("pal load\n");
 	//gpal = modexNewPal();
 	/*modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);*/
-	printf("wwww loop wwww\n");
-	VGAmodeX(1, &gvar);
-	modexPalBlack();	//so player will not see loadings~
+//0000	printf("wwww loop wwww\n");
+	VGAmodeX(1, 1, &gvar);
+//	modexPalBlack();	//so player will not see loadings~
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
+	//modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);
+	start_timer(&gvar);
 	while(ENGI_EXIT != engi_stat)
 	{
 		IN_ReadControl(0,&player);
 		if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;
+		shinku(&gvar);
 	}
 	switch(detectcpu())
 	{
@@ -58,8 +92,10 @@ main(int argc, char *argv[])
 		case 2: cpus = "386 or newer"; break;
 		default: cpus = "internal error"; break;
 	}
+	VGAmodeX(0, 1, &gvar);
+	printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n");
+	printf("version %s\n", VERSION);
 	printf("detected CPU type: %s\n", cpus);
-	VGAmodeX(0, &gvar);
 	IN_Shutdown();
-	modexFadeOn(4, dpal);
+//	modexFadeOn(4, dpal);
 }