Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5822 → Rev 5821

/programs/games/xonix/trunk/kosSyst.cpp
392,7 → 392,7
Dword mainAreaColour,
Byte headerType,
Dword headerColour,
char *title
Dword borderColour
)
{
Dword arg1, arg2, arg3, arg4;
409,7 → 409,7
mov ecx, arg2
mov edx, arg3
mov esi, arg4
mov edi, title
mov edi, borderColour
int 0x40
}
}
726,17 → 726,6
}
 
 
// 48, 4 -- get skin height
Dword kos_GetSkinHeight()
{
__asm{
mov eax, 48
mov ebx, 4
int 0x40
}
}
 
 
// ôóíêöèÿ 70 äîñòóï ê ôàéëîâîé ñèñòåìå
Dword kos_FileSystemAccess( kosFileInfo *fileInfo )
{
827,18 → 816,7
}
 
 
// 71,1 set window caption
void kos_SetWindowCaption(char *caption)
{
__asm{
mov eax, 71
mov ebx, 1
mov ecx, caption
int 0x40
}
}
 
 
// âûçîâ àáñòðàêòíîãî ìåòîäà
int __cdecl _purecall()
{
/programs/games/xonix/trunk/kosSyst.h
86,12 → 86,6
Dword x_size;
Dword y_size;
Word slot_state;
Word reserved2;
Dword client_x;
Dword client_y;
Dword client_width;
Dword client_height;
Byte window_state;
} processInfo;
};
 
137,7 → 131,7
Word sizeX, Word sizeY,
Byte mainAreaType, Dword mainAreaColour,
Byte headerType, Dword headerColour,
char *title
Dword borderColour
);
// ôóíêöèÿ 1 ïîñòàâèòü òî÷êó
void kos_PutPixel( Dword x, Dword y, Dword colour );
194,8 → 188,6
eNumberBase nBase = nbDecimal,
bool valueIsPointer = false
);
// ôóíêöèÿ 48,4 get skin height
Dword kos_GetSkinHeight();
// ôóíêöèÿ 58 äîñòóï ê ôàéëîâîé ñèñòåìå
Dword kos_FileSystemAccess( kosFileInfo *fileInfo );
// ôóíêöèÿ 63
208,8 → 200,6
bool kos_ApplicationMemoryResize( Dword targetSize );
// ôóíêöèÿ 66 ðåæèì ïîëó÷åíèÿ äàííûõ îò êëàâèàòóðû
void kos_SetKeyboardDataMode( Dword mode );
// ôóíêöèÿ 71,1 set window caption
void kos_SetWindowCaption(char *caption);
 
//
void kos_Main();
/programs/games/xonix/trunk/main.cpp
189,11 → 189,11
 
#define blockSize 8
 
#define ENTRY_CLIENT_SIZE_X (400 - 2)
#define ENTRY_CLIENT_SIZE_Y (144 - 2 - 20)
#define ENTRY_WND_SIZE_X 400
#define ENTRY_WND_SIZE_Y 144
 
#define TOP10_CLIENT_SIZE_X (176 - 2)
#define TOP10_CLIENT_SIZE_Y (144 - 2 - 20)
#define TOP10_WND_SIZE_X 176
#define TOP10_WND_SIZE_Y 144
 
#define MAX_X_SIZE 96
#define MIN_X_SIZE 48
201,6 → 201,8
#define MIN_Y_SIZE 28
 
#define flipMapSize ((mapSizeX * mapSizeY) / 4)
#define wndXOffet 1
#define wndYOffset 22
#define freeSpaceCount ((mapSizeX - 4) * (mapSizeY - 4))
//
#define gmEmpty 0
376,15 → 378,11
///
hiScoreFile *top10Heroes = NULL;
 
sProcessInfo process_info;
 
// çàãîëîâîê ãëàâíîãî îêíà
char MainWindowTitle[] = "XONIX (C) MMVI by Rabid Rabbit";
char WindowTitle[128];
char Top10WndTitle[] = "Top 10";
#if LANG == RUS
char goWndTitle[] = "“஢¥­ì %U, § ¢¥à襭® %U%%, ¦¨§­¥©: %U, áçñâ: %U";
char goWndTitleSuperHero[] = "“஢¥­ì %U, § ¢¥à襭® %U%%, ¦¨§­¥©: %U, áçñâ: %U, á㯥ࣥன: %U%%";
char menuStr1[] = "1.  ç âì ¨£àã";
char menuStr2[] = "2. ‚ë室";
char menuStr3[] = "“¯à ¢«¥­¨¥: ‘’…‹Šˆ - ­ ¯à ¢«¥­¨¥ ¤¢¨¦¥­¨ï.";
396,7 → 394,6
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.";
415,8 → 412,8
//
Byte * worldMap = NULL;
//
int wndSizeX = 0;
int wndSizeY = 0;
int wndSizeX = ENTRY_WND_SIZE_X;
int wndSizeY = ENTRY_WND_SIZE_Y;
int mapSizeX = 64;
int mapSizeY = 32;
int loopDelay = DEFAULT_LOOP_DELAY;
910,7 → 907,6
&& rtlRand() > 0x80000000
&& lifeCount < 2
&& GetCompletePercents() > 75 )
{
//
bonus1Set = true;
1354,7 → 1350,7
int i, j;
 
//
// kos_WindowRedrawStatus( 1 );
kos_WindowRedrawStatus( 1 );
//
if ( drawTitle ) drawWndTitleGo();
//
1362,16 → 1358,24
//
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,
( ( mapDiffList[i].elPtr - worldMap ) % mapSizeX ) * blockSize,
( ( mapDiffList[i].elPtr - worldMap ) / mapSizeX ) * blockSize
wndXOffet + ( ( ( mapDiffList[i].elPtr - worldMap ) % mapSizeX ) * blockSize ),
wndYOffset + ( ( ( mapDiffList[i].elPtr - worldMap ) / mapSizeX ) * blockSize )
);
}
//
// kos_WindowRedrawStatus( 2 );
kos_WindowRedrawStatus( 2 );
//
mapDiffList.Clear();
}
1457,10 → 1461,10
scoreCount = 0;
enterName = -1;
//
wndSizeX = ((mapSizeX*blockSize) + 5*2);
wndSizeY = ((mapSizeY*blockSize) + kos_GetSkinHeight() + 5);
wndSizeX = ((mapSizeX*blockSize)+2);
wndSizeY = ((mapSizeY*blockSize)+23);
//
kos_ChangeWindow( -1, -1, wndSizeX-1, wndSizeY-1 );
kos_ChangeWindow( -1, -1, wndSizeX, wndSizeY );
}
 
//
1467,11 → 1471,10
void SetEntryVars()
{
//
wndSizeX = ENTRY_CLIENT_SIZE_X + 5*2;
wndSizeY = ENTRY_CLIENT_SIZE_Y + kos_GetSkinHeight() + 5;
wndSizeX = ENTRY_WND_SIZE_X;
wndSizeY = ENTRY_WND_SIZE_Y;
//
kos_SetWindowCaption(MainWindowTitle);
kos_ChangeWindow( -1, -1, wndSizeX-1, wndSizeY-1 );
kos_ChangeWindow( -1, -1, wndSizeX, wndSizeY );
kos_SetKeyboardDataMode( KM_SCANS );
}
 
1518,10 → 1521,8
while ( kos_CheckForEvent() == 2 ) kos_GetKey( keyCode );
//
kos_SetKeyboardDataMode( KM_CHARS );
 
kos_SetWindowCaption(Top10WndTitle);
//
kos_ChangeWindow(-1, -1, TOP10_CLIENT_SIZE_X + 5 * 2 - 1, TOP10_CLIENT_SIZE_Y + kos_GetSkinHeight() + 5 - 1);
kos_ChangeWindow( -1, -1, TOP10_WND_SIZE_X, TOP10_WND_SIZE_Y );
//
for ( i = 0; i < TOP_TBL_SIZE; i++ )
{
1558,9 → 1559,6
bool workOn = true;
char *cPtr;
 
wndSizeX = ENTRY_CLIENT_SIZE_X + 5 * 2;
wndSizeY = ENTRY_CLIENT_SIZE_Y + kos_GetSkinHeight() + 5;
 
// îòäåëÿåì èìÿ ìîäóëÿ îò ïóòè
cPtr = strrchr( kosExePath, '/' );
// ïðîâåðêà ;)
1567,7 → 1565,7
if ( cPtr == NULL )
{
//
rtlDebugOutString( "xonix: Invalid path to executable." );
rtlDebugOutString( "Invalid path to executable." );
//
return;
}
1608,7 → 1606,7
appState = appStateGo;
SetGameVars();
initWorldMap();
// DrawAppWindow();
DrawAppWindow();
break;
 
//
1647,18 → 1645,14
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;
1809,14 → 1803,6
break;
 
//
case 3:
kos_GetButtonID(buttonID);
if (buttonID == 1)
{
xonixFree();
workOn = false;
}
break;
default:
//
if ( MoveHero() )
1862,7 → 1848,9
break;
//
case 3:
kos_GetButtonID(buttonID);
if ( kos_GetButtonID( buttonID ) )
{
//
if ( buttonID == 1 )
{
//
1870,6 → 1858,7
SetUpTop10();
DrawAppWindow();
}
}
//
default:
break;
1941,14 → 1930,6
//
break;
//
case 3:
kos_GetButtonID(buttonID);
if (buttonID == 1)
{
xonixFree();
workOn = false;
}
break;
default:
break;
}
1970,14 → 1951,7
appState = appStateGo;
}
break;
case 3:
kos_GetButtonID(buttonID);
if (buttonID == 1)
{
xonixFree();
workOn = false;
}
break;
 
default:
break;
}
2047,19 → 2021,16
{
PRINTK pr;
char line[64];
 
//
kos_DefineAndDrawWindow(
100, 100,
wndSizeX-1, wndSizeY-1,
0x34, 0,
wndSizeX, wndSizeY,
0, 0,
MainWindowTitle
0, 0x2040A0,
0x2040A0
);
//
if (process_info.processInfo.window_state & 0x06)
return;
 
/*
kos_WriteTextToWindow(
4, 4,
0x10, 0x42D2E2,
2066,10 → 2037,9
MainWindowTitle,
sizeof( MainWindowTitle ) - 1
);
*/
//
kos_WriteTextToWindow(
8-1, 32-21,
8, 32,
0x10, 0x12FF12,
menuStr1,
sizeof( menuStr1 ) - 1
2076,7 → 2046,7
);
//
kos_WriteTextToWindow(
8-1, 48-21,
8, 48,
0x10, 0x12FF12,
menuStr2,
sizeof( menuStr2 ) - 1
2083,7 → 2053,7
);
//
kos_WriteTextToWindow(
8-1, 80-21,
8, 80,
0x10, 0xD0FF12,
menuStr3,
sizeof( menuStr3 ) - 1
2090,7 → 2060,7
);
//
kos_WriteTextToWindow(
8-1, 96-21,
8, 96,
0x10, 0xD0FF12,
menuStr4,
sizeof( menuStr4 ) - 1
2102,55 → 2072,47
sprintk( line, &pr );
//
kos_WriteTextToWindow(
8-1, 112-21,
8, 112,
0x10, 0x12C0D0,
line,
strlen( line )
);
// êíîïêè X
// xo oo
// oo
kos_DefineButton(
ENTRY_CLIENT_SIZE_X - 62, 112-24,
13, 13,
ENTRY_WND_SIZE_X - 58, 112,
12, 12,
BT_SIZE_X_MINUS,
0xCCCCCC
);
//
kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_CLIENT_SIZE_X - (62-1) + 3, 117-23 );
kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_WND_SIZE_X - 58 + 3, 117 );
//
// ox oo
// oo
kos_DefineButton(
ENTRY_CLIENT_SIZE_X - 48, 112-24,
13, 13,
ENTRY_WND_SIZE_X - 45, 112,
12, 12,
BT_SIZE_X_PLUS,
0xCCCCCC
);
//
kos_PutImage( bmPMButton, 6, 6, ENTRY_CLIENT_SIZE_X - (48-1) + 3, 115-23 );
kos_PutImage( bmPMButton, 6, 6, ENTRY_WND_SIZE_X - 45 + 3, 115 );
// êíîïêè Y
// oo xo
// oo
kos_DefineButton(
ENTRY_CLIENT_SIZE_X - 31, 112-24,
13, 13,
ENTRY_WND_SIZE_X - 29, 112,
12, 12,
BT_SIZE_Y_MINUS,
0xCCCCCC
);
//
kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_CLIENT_SIZE_X - (31-1) + 3, 117-23 );
kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_WND_SIZE_X - 29 + 3, 117 );
//
// oo ox
// oo
kos_DefineButton(
ENTRY_CLIENT_SIZE_X - 17, 112-24,
13, 13,
ENTRY_WND_SIZE_X - 16, 112,
12, 12,
BT_SIZE_Y_PLUS,
0xCCCCCC
);
//
kos_PutImage( bmPMButton, 6, 6, ENTRY_CLIENT_SIZE_X - (17-1) + 3, 115-23 );
kos_PutImage( bmPMButton, 6, 6, ENTRY_WND_SIZE_X - 16 + 3, 115 );
//
//çàäåðæêà â öèêëå âûáîðêè ñîîáùåíèé
pr.fmtline = mainLoopDelayStr;
2158,7 → 2120,7
sprintk( line, &pr );
//
kos_WriteTextToWindow(
8-1, 128-21,
8, 128,
0x10, 0x12C0D0,
line,
strlen( line )
2165,22 → 2127,22
);
//
kos_DefineButton(
ENTRY_CLIENT_SIZE_X - 31, 128-23,
13, 13,
ENTRY_WND_SIZE_X - 29, 128,
12, 12,
BT_LOOP_MINUS,
0xCCCCCC
);
//
kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_CLIENT_SIZE_X - (31-1) + 3, 133-22 );
kos_PutImage( bmPMButton + 12, 6, 2, ENTRY_WND_SIZE_X - 29 + 3, 133 );
//
kos_DefineButton(
ENTRY_CLIENT_SIZE_X - 17, 128-23,
13, 13,
ENTRY_WND_SIZE_X - 16, 128,
12, 12,
BT_LOOP_PLUS,
0xCCCCCC
);
//
kos_PutImage( bmPMButton, 6, 6, ENTRY_CLIENT_SIZE_X - (17-1) + 3, 131-22 );
kos_PutImage( bmPMButton, 6, 6, ENTRY_WND_SIZE_X - 16 + 3, 131 );
}
 
 
2187,8 → 2149,8
//
void DrawAppWindow()
{
//
kos_WindowRedrawStatus( 1 );
kos_ProcessInfo(&process_info, -1);
 
switch (appState)
{
2205,10 → 2167,6
case appStateGo:
case appStateShowMap:
case appStatePause:
if (process_info.processInfo.window_state & 0x06)
{
appState = appStatePause;
}
drawWorldMap();
break;
//
2217,8 → 2175,8
drawWorldMap();
//
kos_DefineButton(
((wndSizeX - 10) / 2) - 64,
((wndSizeY - kos_GetSkinHeight() - 5) / 2) - 16,
( wndSizeX / 2 ) - 64,
( wndSizeY / 2 ) - 16,
128, 32,
1,
0x136793
2225,12 → 2183,13
);
//
kos_WriteTextToWindow(
((wndSizeX - 10) / 2) - (sizeof(thatsAllStr)* 4),
((wndSizeY - kos_GetSkinHeight() - 5) / 2) - 4,
( wndSizeX / 2 ) - ( sizeof( thatsAllStr ) * 4 ),
( wndSizeY / 2 ) - 4,
0x10, 0xFFFFFF,
thatsAllStr,
sizeof (thatsAllStr)-1
);
 
//
break;
//
2354,10 → 2313,10
//
kos_DefineAndDrawWindow(
100, 100,
wndSizeX-1, wndSizeY-1,
0x74, 0,
wndSizeX, wndSizeY,
0, 0,
MainWindowTitle
0, 0x2040A0,
0x2040A0
);
//
drawWndTitleGo();
2383,57 → 2342,23
void drawWndTitleGo()
{
PRINTK pr;
static char prev_title[64] = {'\0'};
char line[64];
 
//
/*
kos_DrawBar(
1, 1,
wndSizeX - 2, 18,
0x2040A0
);
*/
 
//
//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;
}
sprintk(WindowTitle, &pr);
sprintk( line, &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);
}
/*
kos_WriteTextToWindow(
4, 4,
0x10, 0x42D2E2,
2440,9 → 2365,7
line,
strlen( line )
);
*/
//
/*
if ( bonus1Count > 0 )
{
//
2457,9 → 2380,8
( bonus1Count * ( wndSizeX - 4 ) ) / BONUS1_LIFETIME, BONUS1_IND_HSIZE,
0x5720B0
);
}*/
}
}
 
//
void drawWorldMapForFlip()
2467,8 → 2389,6
int i, j;
Byte *mPtr = worldMap;
 
if (process_info.processInfo.window_state & 0x06)
return;
//
for ( i = 0; i < mapSizeY; i++ )
{
2475,12 → 2395,20
//
for ( j = 0; j < mapSizeX; j++ )
{
////
//kos_DrawBar(
// wndXOffet + ( j * blockSize ),
// wndYOffset + ( i * blockSize ),
// blockSize, blockSize,
// mapColours[*mPtr]
//);
//
kos_PutImage(
mapColours[*mPtr],
blockSize,
blockSize,
j * blockSize,
i * blockSize
wndXOffet + ( j * blockSize ),
wndYOffset + ( i * blockSize )
);
//
mPtr++;
2518,6 → 2446,9
 
 
//
char Top10WndTitle[] = "Top 10";
 
//
void DrawTop10Window()
{
int i;
2525,15 → 2456,12
//
kos_DefineAndDrawWindow(
100, 100,
TOP10_WND_SIZE_X, TOP10_WND_SIZE_Y,
0, 0,
0x34, 0,
0, 0,
Top10WndTitle
0, 0x2040A0,
0x2040A0
);
//
if (process_info.processInfo.window_state & 0x06)
return;
/*
kos_WriteTextToWindow(
4, 4,
0x0, 0x42D2E2,
2540,13 → 2468,12
Top10WndTitle,
sizeof( Top10WndTitle ) - 1
);
*/
//
for ( i = 0; i < TOP_TBL_SIZE; i++ )
{
//
kos_WriteTextToWindow(
6-1, 2 + (i * 10),
6, wndYOffset + 2 + (i * 10),
0x0, enterName != i ? 0xFFFFFF : 0x00FF00,
heroTbl[i].name,
sizeof( heroTbl[0].name )
2555,7 → 2482,7
kos_DisplayNumberToWindow(
heroTbl[i].score,
8,
112-1, 2 + (i * 10),
112, wndYOffset + 2 + (i * 10),
0xFFFF55,
nbDecimal,
false
2563,7 → 2490,7
}
//
kos_WriteTextToWindow(
6-1, 6 + (i * 10),
6, wndYOffset + 6 + (i * 10),
0x10, 0x1060D0,
enterName >= 0 ? top10str1 : top10str2,
enterName >= 0 ? sizeof(top10str1) - 1 : sizeof(top10str2) - 1