WebSVN – Kolibri OS – Diff – /programs/games/xonix/trunk/main.cpp

 #define MAX_LOOP_DELAY		20
 #define DEFAULT_LOOP_DELAY	12
 #define blockSize			8
-#define ENTRY_WND_SIZE_X	400
+#define ENTRY_CLIENT_SIZE_X	(400 - 2)
-#define ENTRY_WND_SIZE_Y	144
+#define ENTRY_CLIENT_SIZE_Y	(144 - 2 - 20)
-#define TOP10_WND_SIZE_X	176
+#define TOP10_CLIENT_SIZE_X	(176 - 2)
-#define TOP10_WND_SIZE_Y	144
+#define TOP10_CLIENT_SIZE_Y	(144 - 2 - 20)
 #define MAX_X_SIZE			96
-#define MIN_X_SIZE			48
-#define MAX_Y_SIZE			56
-#define MIN_Y_SIZE			28
+#define MIN_X_SIZE			48
 #define MAX_Y_SIZE			56
-#define flipMapSize			((mapSizeX * mapSizeY) / 4)
+#define MIN_Y_SIZE			28
 #define wndXOffet			1
-#define wndYOffset			22
+#define flipMapSize			((mapSizeX * mapSizeY) / 4)
 };
 ///
+hiScoreFile *top10Heroes = NULL;
 hiScoreFile *top10Heroes = NULL;
 sProcessInfo process_info;
+// çàãîëîâîê ãëàâíîãî îêíà
 char MainWindowTitle[] = "XONIX (C) MMVI by Rabid Rabbit";
-// çàãîëîâîê ãëàâíîãî îêíà
+char WindowTitle[128];
+char Top10WndTitle[] = "Top 10";
-char MainWindowTitle[] = "XONIX (C) MMVI by Rabid Rabbit";
+#if LANG == RUS
-#if LANG == RUS
+char goWndTitle[] = "à®¢¥ì %U, § ¢¥àè¥® %U%%, ¦¨§¥©: %U, áçñâ: %U";
-char goWndTitle[] = "à®¢¥ì %U, § ¢¥àè¥® %U%%, ¦¨§¥©: %U, áçñâ: %U";
+char goWndTitleSuperHero[] = "à®¢¥ì %U, § ¢¥àè¥® %U%%, ¦¨§¥©: %U, áçñâ: %U, áã¯¥à£¥à®©: %U%%";
 char menuStr1[] = "1.  ç âì ¨£àã";
 char menuStr2[] = "2. ëå®¤";
 char mainLoopDelayStr[] = "ª®à®áâì %U";
 char top10str1[] = "ENTER - ¨¬ï Ok.";
 char top10str2[] = "ESC - ¢ëå®¤ ¢ ¬¥î";
 #else
 char goWndTitle[] = "Level %U, completed %U%%, lives: %U, scores: %U";
+char goWndTitle[] = "Level %U, completed %U%%, lives: %U, scores: %U, superhero: %U%%";
 char menuStr1[] = "1. Start game";
 char menuStr2[] = "2. Exit";
 char menuStr3[] = "Control: ARROWS - direction of movement.";
 char menuStr4[] = "SPACE - pause, ESC - leave to menu.";
 char thatsAllStr[] = "Game finished.";
 Byte *heroPtr = NULL;
 int heroDX = 0, heroDY = 0, lastMoveDirection = 0;
 //
 Byte * worldMap = NULL;
 //
-int	wndSizeX = ENTRY_WND_SIZE_X;
+int	wndSizeX = 0;
-int	wndSizeY = ENTRY_WND_SIZE_Y;
+int	wndSizeY = 0;
 int mapSizeX = 64;
 int mapSizeY = 32;
 int loopDelay = DEFAULT_LOOP_DELAY;
 int currentLevel = 1;
 int appState = appStateEntry;
 	//
-	if ( (!bonus1Set)
+	if ((!bonus1Set)
 		&& rtlRand() > 0x80000000
 		&& lifeCount < 2
 		&& GetCompletePercents() > 75 )
+	{
 		//
 		bonus1Set = true;
 		//
 		for ( i = rtlRand() % (mapSizeX * mapSizeY); worldMap[i] != gmWall; i = rtlRand() % (mapSizeX * mapSizeY) );
 void ApplyMapDiffs( bool drawTitle )
+{
 	int i, j;
 	//
-	kos_WindowRedrawStatus( 1 );
+//	kos_WindowRedrawStatus( 1 );
 	//
 	if ( drawTitle ) drawWndTitleGo();
 	//
 	j = mapDiffList.GetCount();
 	//
 	for ( i = 0; i < j; i++ )
-	{
-		////
-		//kos_DrawBar(
-		//	wndXOffet + ( ( ( mapDiffList[i].elPtr - worldMap ) % mapSizeX ) * blockSize ),
-		//	wndYOffset + ( ( ( mapDiffList[i].elPtr - worldMap ) / mapSizeX ) * blockSize ),
-		//	blockSize, blockSize,
-		//	mapColours[mapDiffList[i].mapEl]
-		//);
 		//
 		kos_PutImage(
 			mapColours[mapDiffList[i].mapEl],
 			blockSize,
 			blockSize,
-			wndXOffet + ( ( ( mapDiffList[i].elPtr - worldMap ) % mapSizeX ) * blockSize ),
+			( ( mapDiffList[i].elPtr - worldMap ) % mapSizeX ) * blockSize,
-			wndYOffset + ( ( ( mapDiffList[i].elPtr - worldMap ) / mapSizeX ) * blockSize )
+			( ( mapDiffList[i].elPtr - worldMap ) / mapSizeX ) * blockSize
 			);
+	}
 	//
-	kos_WindowRedrawStatus( 2 );
+//	kos_WindowRedrawStatus( 2 );
 	//
 	mapDiffList.Clear();
 	currentHero = gmHero;
 	currentTrack = gmTrack;
 	scoreCount = 0;
 	enterName = -1;
 	//
-	wndSizeX = ((mapSizeX*blockSize)+2);
+	wndSizeX = ((mapSizeX*blockSize) + 5*2);
-	wndSizeY = ((mapSizeY*blockSize)+23);
+	wndSizeY = ((mapSizeY*blockSize) + kos_GetSkinHeight() + 5);
 	//
-	kos_ChangeWindow( -1, -1, wndSizeX, wndSizeY );
+	kos_ChangeWindow( -1, -1, wndSizeX-1, wndSizeY-1 );
+}
 //
 void SetEntryVars()
+{
 	//
-	wndSizeX = ENTRY_WND_SIZE_X;
+	wndSizeX = ENTRY_CLIENT_SIZE_X + 5*2;
-	wndSizeY = ENTRY_WND_SIZE_Y;
+	wndSizeY = ENTRY_CLIENT_SIZE_Y + kos_GetSkinHeight() + 5;
+	//
-	//
+	kos_SetWindowCaption(MainWindowTitle);
-	kos_ChangeWindow( -1, -1, wndSizeX, wndSizeY );
+	kos_ChangeWindow( -1, -1, wndSizeX-1, wndSizeY-1 );
 	kos_SetKeyboardDataMode( KM_SCANS );
+}
 	//
 	while ( kos_CheckForEvent() == 2 ) kos_GetKey( keyCode );
 	//
+	kos_SetKeyboardDataMode( KM_CHARS );
-	kos_SetKeyboardDataMode( KM_CHARS );
+	kos_SetWindowCaption(Top10WndTitle);
 	//
-	kos_ChangeWindow( -1, -1, TOP10_WND_SIZE_X, TOP10_WND_SIZE_Y );
+	kos_ChangeWindow(-1, -1, TOP10_CLIENT_SIZE_X + 5 * 2 - 1, TOP10_CLIENT_SIZE_Y + kos_GetSkinHeight() + 5 - 1);
 	//
 	for ( i = 0; i < TOP_TBL_SIZE; i++ )
+	{
 		//
 	Byte keyCode;
 	Byte *bPtr;
 	bool workOn = true;
 	char *cPtr;
+	wndSizeX = ENTRY_CLIENT_SIZE_X + 5 * 2;
+	wndSizeY = ENTRY_CLIENT_SIZE_Y + kos_GetSkinHeight() + 5;
 	// îòäåëÿåì èìÿ ìîäóëÿ îò ïóòè
 	cPtr = strrchr( kosExePath, '/' );
 	// ïðîâåðêà ;)
 	if ( cPtr == NULL )
+	{
 		//
-		rtlDebugOutString( "Invalid path to executable." );
+		rtlDebugOutString( "xonix: Invalid path to executable." );
 		//
 		return;
+	}
 	//
 				case 2:
 					//
 					appState = appStateGo;
 					SetGameVars();
 					initWorldMap();
-					DrawAppWindow();
+//					DrawAppWindow();
 					break;
 				//
 				case 3:
 					mapSizeY -= 2;
 					if ( mapSizeY < MIN_Y_SIZE ) mapSizeY = MIN_Y_SIZE;
 					break;
 				//
 				case BT_LOOP_MINUS:
-					loopDelay++;;
+					loopDelay++;
 					if ( loopDelay > MAX_LOOP_DELAY ) loopDelay = MAX_LOOP_DELAY;
 					break;
 				//
 				case BT_LOOP_PLUS:
-					loopDelay--;;
+					loopDelay--;
 					if ( loopDelay < MIN_LOOP_DELAY ) loopDelay = MIN_LOOP_DELAY;
 					break;
+				case 1:
+					xonixFree();
+					workOn = false;
+					break;
 				//
 				default:
 					break;
+				}
 				DrawAppWindow();
+				}
 				ApplyMapDiffs();
 				break;
+			//
+			case 3:
+				kos_GetButtonID(buttonID);
+				if (buttonID == 1)
+				{
+					xonixFree();
+					workOn = false;
+				}
-			//
+				break;
 			default:
 				//
 				if ( MoveHero() )
+				{
 					DrawAppWindow();
+				}
 				break;
 			//
 			case 3:
-				if ( kos_GetButtonID( buttonID ) )
+				kos_GetButtonID(buttonID);
-				{
-					//
-					if ( buttonID == 1 )
+				if ( buttonID == 1 )
+				{
-						//
+					//
-						appState = appStateTop10;
+					appState = appStateTop10;
-						SetUpTop10();
+					SetUpTop10();
-						DrawAppWindow();
+					DrawAppWindow();
+				}
-				}
 			//
 			default:
 				break;
+			}
 			break;
 					DrawAppWindow();
+				}
 				//
 				break;
 			//
+			case 3:
+				kos_GetButtonID(buttonID);
+				if (buttonID == 1)
+				{
+					xonixFree();
+					workOn = false;
+				}
+				break;
 			default:
 				break;
+			}
 			break;
+				{
 					//
 					appState = appStateGo;
+				}
 				break;
+			case 3:
+				kos_GetButtonID(buttonID);
+				if (buttonID == 1)
+				{
+					xonixFree();
+					workOn = false;
+				}
+				break;
 			default:
 				break;
+			}
 			break;
 //
 void DrawEntryScreen()
+{
 	PRINTK pr;
 	char line[64];
 	//
 	kos_DefineAndDrawWindow(
 , 100,
-		wndSizeX, wndSizeY,
+		wndSizeX-1, wndSizeY-1,
+x34, 0,
 , 0,
-, 0x2040A0,
+		MainWindowTitle
-x2040A0
 		);
 	//
+	if (process_info.processInfo.window_state & 0x06)
+		return;
+	/*
 	kos_WriteTextToWindow(
 , 4,
 x10, 0x42D2E2,
 		MainWindowTitle,
 		sizeof( MainWindowTitle ) - 1
 		);
+		*/
 	//
 	kos_WriteTextToWindow(
-, 32,
+-1, 32-21,
 x10, 0x12FF12,
 		menuStr1,
 		sizeof( menuStr1 ) - 1
 		);
 	//
 	kos_WriteTextToWindow(
-, 48,
+-1, 48-21,
 x10, 0x12FF12,
 		menuStr2,
 		sizeof( menuStr2 ) - 1
 		);
 	//
 	kos_WriteTextToWindow(
-, 80,
+-1, 80-21,
 x10, 0xD0FF12,
 		menuStr3,
 		sizeof( menuStr3 ) - 1
 		);
 	//
 	kos_WriteTextToWindow(
-, 96,
+-1, 96-21,
 x10, 0xD0FF12,
 		menuStr4,
 		sizeof( menuStr4 ) - 1
 		);
 	// ðàçìåð ïîëÿ
 	pr.args[0] = mapSizeX;
 	pr.args[1] = mapSizeY;
 	sprintk( line, &pr );
 	//
 	kos_WriteTextToWindow(
-, 112,
+-1, 112-21,
 x10, 0x12C0D0,
 		line,
 		strlen( line )
 		);
 	// êíîïêè X
+	// xo oo
+	//	  oo
 	kos_DefineButton(
-		ENTRY_WND_SIZE_X - 58, 112,
+		ENTRY_CLIENT_SIZE_X - 62, 112-24,
-, 12,
+, 13,
 		BT_SIZE_X_MINUS,
 xCCCCCC
 		);
 	//
-	kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_WND_SIZE_X - 58 + 3, 117 );
+	kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_CLIENT_SIZE_X - (62-1) + 3, 117-23 );
 	//
+	// ox oo
+	//	  oo
 	kos_DefineButton(
-		ENTRY_WND_SIZE_X - 45, 112,
+		ENTRY_CLIENT_SIZE_X - 48, 112-24,
-, 12,
+, 13,
 		BT_SIZE_X_PLUS,
 xCCCCCC
 		);
 	//
-	kos_PutImage( bmPMButton, 6, 6, ENTRY_WND_SIZE_X - 45 + 3, 115 );
+	kos_PutImage( bmPMButton, 6, 6, ENTRY_CLIENT_SIZE_X - (48-1) + 3, 115-23 );
 	// êíîïêè Y
+	// oo xo
+	//	  oo
 	kos_DefineButton(
-		ENTRY_WND_SIZE_X - 29, 112,
+		ENTRY_CLIENT_SIZE_X - 31, 112-24,
-, 12,
+, 13,
 		BT_SIZE_Y_MINUS,
 xCCCCCC
 		);
 	//
-	kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_WND_SIZE_X - 29 + 3, 117 );
+	kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_CLIENT_SIZE_X - (31-1) + 3, 117-23 );
 	//
+	// oo ox
+	//	  oo
 	kos_DefineButton(
-		ENTRY_WND_SIZE_X - 16, 112,
+		ENTRY_CLIENT_SIZE_X - 17, 112-24,
-, 12,
+, 13,
 		BT_SIZE_Y_PLUS,
 xCCCCCC
 		);
 	//
-	kos_PutImage( bmPMButton, 6, 6, ENTRY_WND_SIZE_X - 16 + 3, 115 );
+	kos_PutImage( bmPMButton, 6, 6, ENTRY_CLIENT_SIZE_X - (17-1) + 3, 115-23 );
 	//
 	//çàäåðæêà â öèêëå âûáîðêè ñîîáùåíèé
 	pr.fmtline = mainLoopDelayStr;
 	pr.args[0] = MAX_LOOP_DELAY + MIN_LOOP_DELAY - loopDelay;
 	sprintk( line, &pr );
 	//
 	kos_WriteTextToWindow(
-, 128,
+-1, 128-21,
 x10, 0x12C0D0,
 		line,
 		strlen( line )
 		);
 	//
 	kos_DefineButton(
-		ENTRY_WND_SIZE_X - 29, 128,
+		ENTRY_CLIENT_SIZE_X - 31, 128-23,
-, 12,
+, 13,
 		BT_LOOP_MINUS,
 xCCCCCC
 		);
 	//
-	kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_WND_SIZE_X - 29 + 3, 133 );
+	kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_CLIENT_SIZE_X - (31-1) + 3, 133-22 );
 	//
 	kos_DefineButton(
-		ENTRY_WND_SIZE_X - 16, 128,
+		ENTRY_CLIENT_SIZE_X - 17, 128-23,
-, 12,
+, 13,
 		BT_LOOP_PLUS,
 xCCCCCC
 		);
 	//
-	kos_PutImage( bmPMButton, 6, 6, ENTRY_WND_SIZE_X - 16 + 3, 131 );
+	kos_PutImage( bmPMButton, 6, 6, ENTRY_CLIENT_SIZE_X - (17-1) + 3, 131-22 );
+}
 //
-void DrawAppWindow()
 void DrawAppWindow()
+{
-	//
+	kos_WindowRedrawStatus( 1 );
-	kos_WindowRedrawStatus( 1 );
+	kos_ProcessInfo(&process_info, -1);
-	switch ( appState )
+	switch (appState)
 		break;
-	//
+		//
 	case appStateGo:
 	case appStateShowMap:
 	case appStatePause:
+		if (process_info.processInfo.window_state & 0x06)
+		{
+			appState = appStatePause;
+		}
 		drawWorldMap();
 		break;
-	//
+		//
 	case appStateAfterDeath:
 		//
 		drawWorldMap();
 		//
 		kos_DefineButton(
-			( wndSizeX / 2 ) - 64,
+			((wndSizeX - 10) / 2) - 64,
-			( wndSizeY / 2 ) - 16,
+			((wndSizeY - kos_GetSkinHeight() - 5) / 2) - 16,
 , 32,
 ,
 x136793
 			);
 		//
 		kos_WriteTextToWindow(
-			( wndSizeX / 2 ) - ( sizeof( thatsAllStr ) * 4 ),
+			((wndSizeX - 10) / 2) - (sizeof(thatsAllStr)* 4),
-			( wndSizeY / 2 ) - 4,
+			((wndSizeY - kos_GetSkinHeight() - 5) / 2) - 4,
 x10, 0xFFFFFF,
 			thatsAllStr,
-			sizeof ( thatsAllStr ) - 1
+			sizeof (thatsAllStr)-1
 			);
-		//
+			//
 		break;
-	//
+		//
 	case appStateHideMap:
 		drawWorldMapForFlip();
 void drawWorldMap()
+{
 	//
 	kos_DefineAndDrawWindow(
 , 100,
-		wndSizeX, wndSizeY,
+		wndSizeX-1, wndSizeY-1,
+x74, 0,
 , 0,
-, 0x2040A0,
+		MainWindowTitle
-x2040A0
 		);
 	//
 	drawWndTitleGo();
 	//
 	drawWorldMapForFlip();
 //
 void drawWndTitleGo()
+{
 	PRINTK pr;
-	char line[64];
+	static char prev_title[64] = {'\0'};
 	//
-	//
+	/*
 	kos_DrawBar(
 , 1,
 		wndSizeX - 2, 18,
 x2040A0
 		);
+		*/
 	//
-	pr.fmtline = goWndTitle;
+	//pr.fmtline = goWndTitle;
 	pr.args[0] = currentLevel;
 	pr.args[1] = GetCompletePercents();
+	pr.args[2] = lifeCount;
+	pr.args[3] = scoreCount;
+	if (bonus1Count > 0)
+	{
+		pr.args[4] = 100*bonus1Count/BONUS1_LIFETIME;
+		pr.fmtline = goWndTitleSuperHero;
+	}
+	else
+	{
+		pr.fmtline = goWndTitle;
-	pr.args[2] = lifeCount;
 	pr.args[3] = scoreCount;
+	sprintk(WindowTitle, &pr);
+	//
+	bool same = true;
+	for (int i = 0; i < 64; i++)
+	{
+		if (WindowTitle[i] != prev_title[i])
+		{
+			same = false;
+			break;
+		}
+		if ((WindowTitle[i] == '\0') || (prev_title[i] == '\0'))
+		{
+			break;
+		}
+	}
+	if (!same)
+	{
+		kos_SetWindowCaption(WindowTitle);
+		strcpy(prev_title, WindowTitle);
+	}
 	sprintk( line, &pr );
-	//
+		/*
 	kos_WriteTextToWindow(
 , 4,
 x10, 0x42D2E2,
 		line,
+		strlen( line )
-		strlen( line )
+		);
+		*/
-		);
+	//
-	//
+	/*
 	if ( bonus1Count > 0 )
+	{
 		//
 		kos_DrawBar(
 , 22 - BONUS1_IND_HSIZE - 1,
 			( bonus1Count * ( wndSizeX - 4 ) ) / BONUS1_LIFETIME, BONUS1_IND_HSIZE,
 x5720B0
 			);
-	}
+	}*/
+}
 //
 void drawWorldMapForFlip()
+{
 	int i, j;
+	Byte *mPtr = worldMap;
-	Byte *mPtr = worldMap;
+	if (process_info.processInfo.window_state & 0x06)
 		return;
 	//
 	for ( i = 0; i < mapSizeY; i++ )
+	{
 		//
-		for ( j = 0; j < mapSizeX; j++ )
-		{
-			////
-			//kos_DrawBar(
-			//	wndXOffet + ( j * blockSize ),
-			//	wndYOffset + ( i * blockSize ),
-			//	blockSize, blockSize,
-			//	mapColours[*mPtr]
-			//);
+		for ( j = 0; j < mapSizeX; j++ )
 			//
 			kos_PutImage(
 				mapColours[*mPtr],
 				blockSize,
 				blockSize,
-				wndXOffet + ( j * blockSize ),
+				j * blockSize,
-				wndYOffset + ( i * blockSize )
+				i * blockSize
 				);
 			//
 			mPtr++;
+	}
+}
-//
-char Top10WndTitle[] = "Top 10";
 //
 void DrawTop10Window()
+{
 	int i;
-	//
-	kos_DefineAndDrawWindow(
+	//
-, 100,
+	kos_DefineAndDrawWindow(
-		TOP10_WND_SIZE_X, TOP10_WND_SIZE_Y,
+, 100,
+, 0,
-, 0,
+x34, 0,
-, 0x2040A0,
+, 0,
+		Top10WndTitle
+		);
+	//
-x2040A0
+	if (process_info.processInfo.window_state & 0x06)
-		);
+		return;
-	//
+	/*
 	kos_WriteTextToWindow(
 , 4,
 x0, 0x42D2E2,
+		Top10WndTitle,
-		Top10WndTitle,
+		sizeof( Top10WndTitle ) - 1
-		sizeof( Top10WndTitle ) - 1
+		);
-		);
+		*/
 	//
 	for ( i = 0; i < TOP_TBL_SIZE; i++ )
 	{
 		//
 		kos_WriteTextToWindow(
-, wndYOffset + 2 + (i * 10),
+-1, 2 + (i * 10),
 x0, enterName != i ? 0xFFFFFF : 0x00FF00,
 			heroTbl[i].name,
 			sizeof( heroTbl[0].name )
 			);
 		//
 		kos_DisplayNumberToWindow(
 			heroTbl[i].score,
 ,
-, wndYOffset + 2 + (i * 10),
+-1, 2 + (i * 10),
 xFFFF55,
 			nbDecimal,
 			false
 			);
 	}
 	//
 	kos_WriteTextToWindow(
-, wndYOffset + 6 + (i * 10),
+-1, 6 + (i * 10),
 x10, 0x1060D0,
 		enterName >= 0 ? top10str1 : top10str2,

Subversion Repositories Kolibri OS

(root)/programs/games/xonix/trunk/main.cpp @ 5098 – Rev 5098 → 5822