octospacc
/
BloccSpacc
mirror of https://gitlab.com/octospacc/BloccSpacc
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Working inventory view

This commit is contained in:
octospacc 2022-08-05 20:45:40 +02:00
parent 21bc35baec
commit 4b55257b4f
1 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
Source/Main.c
View File

@ -31,7 +31,6 @@ bool Quit, Recalc, DebugMode;
// <https://www.libsdl.org/release/SDL-1.2.15/docs/html/guidetimeexamples.html> // <https://www.libsdl.org/release/SDL-1.2.15/docs/html/guidetimeexamples.html>
static Uint32 NextTickTime; static Uint32 NextTickTime;
static Uint32 InputTickTime;
Uint32 CalcTimeLeft() { Uint32 CalcTimeLeft() {
Uint32 Now; Uint32 Now;
Now = SDL_GetTicks(); Now = SDL_GetTicks();
@ -45,6 +44,7 @@ Uint32 CalcTimeLeft() {
struct UsedKeys { struct UsedKeys {
bool Up, Down, Left, Right, Above, Below; bool Up, Down, Left, Right, Above, Below;
bool Place, Break; bool Place, Break;
bool Esc, Inventory;
} UsedKeys; } UsedKeys;
struct xyz CursorPos, Camera, ChunksNum; struct xyz CursorPos, Camera, ChunksNum;
@ -122,29 +122,48 @@ void MoveCursor (int Direction) {
} }
void EventHandle() { void EventHandle() {
if ( UsedKeys.Up ) { if ( InGame && !InInventory ) {
MoveCursor( 0 ); if ( UsedKeys.Esc ) {
Quit = true;
}
if ( UsedKeys.Inventory ) {
InInventory = true;
}
if ( UsedKeys.Up ) {
MoveCursor( 0 );
}
if ( UsedKeys.Right ) {
MoveCursor( 2 );
}
if ( UsedKeys.Down ) {
MoveCursor( 4 );
}
if ( UsedKeys.Left ) {
MoveCursor( 6 );
}
if ( UsedKeys.Above) {
MoveCursor( 8 );
}
if ( UsedKeys.Below ) {
MoveCursor( 9 );
}
if ( UsedKeys.Place ) {
Map[CursorPos.y/BlockSize][CursorPos.z/BlockSize][CursorPos.x/BlockSize] = SelectedBlock;
}
if ( UsedKeys.Break ) {
Map[CursorPos.y/BlockSize][CursorPos.z/BlockSize][CursorPos.x/BlockSize] = 0;
}
} }
if ( UsedKeys.Right ) { else if ( InInventory ) {
MoveCursor( 2 ); if ( UsedKeys.Esc || UsedKeys.Inventory ) {
} InInventory = false;
if ( UsedKeys.Down ) { }
MoveCursor( 4 ); if ( UsedKeys.Left && SelectedBlock > 1 ) {
} SelectedBlock--;
if ( UsedKeys.Left ) { }
MoveCursor( 6 ); if ( UsedKeys.Right && SelectedBlock < BlocksetNum-1 ) {
} SelectedBlock++;
if ( UsedKeys.Above) { }
MoveCursor( 8 );
}
if ( UsedKeys.Below ) {
MoveCursor( 9 );
}
if ( UsedKeys.Place ) {
Map[CursorPos.y/BlockSize][CursorPos.z/BlockSize][CursorPos.x/BlockSize] = SelectedBlock;
}
if ( UsedKeys.Break ) {
Map[CursorPos.y/BlockSize][CursorPos.z/BlockSize][CursorPos.x/BlockSize] = 0;
} }
UsedKeys.Up = false; UsedKeys.Up = false;
UsedKeys.Down = false; UsedKeys.Down = false;
@ -154,6 +173,8 @@ void EventHandle() {
UsedKeys.Below = false; UsedKeys.Below = false;
UsedKeys.Place = false; UsedKeys.Place = false;
UsedKeys.Break = false; UsedKeys.Break = false;
UsedKeys.Esc = false;
UsedKeys.Inventory = false;
} }
void DrawInventory() { void DrawInventory() {
@ -295,16 +316,6 @@ void GameInit() {
InGame = true; InGame = true;
} }
void KeyListen() {
Uint8 * Keys = SDL_GetKeyState( NULL );
if ( Keys [KeyUp] ) {
UsedKeys.Up = 1;
}
if ( Keys [KeyDown] ) {
UsedKeys.Down = 1;
}
}
int main( int argc, char* args[] ) { int main( int argc, char* args[] ) {
printf("[I] Starting!\n"); printf("[I] Starting!\n");
srand( time( NULL ) ); srand( time( NULL ) );
@ -322,31 +333,19 @@ int main( int argc, char* args[] ) {
while ( !Quit ) { while ( !Quit ) {
NextTickTime = SDL_GetTicks() + GameTick; NextTickTime = SDL_GetTicks() + GameTick;
while ( SDL_PollEvent( & Event ) ) { while ( SDL_PollEvent( & Event ) ) {
//Recalc = true;
if ( Event.type == SDL_QUIT ) { if ( Event.type == SDL_QUIT ) {
Quit = true; Quit = true;
} }
else if ( Event.type == SDL_KEYDOWN ) {
Recalc = true;
}
else if ( Event.type == SDL_KEYUP ) { else if ( Event.type == SDL_KEYUP ) {
Recalc = true;
if ( Event.key.keysym.sym == KeyEsc ) { if ( Event.key.keysym.sym == KeyEsc ) {
if ( InGame && !InInventory ) { UsedKeys.Esc = true;
Quit = true;
}
if ( InInventory ) {
InInventory = false;
}
} }
else if ( Event.key.keysym.sym == KeyDebug ) { else if ( Event.key.keysym.sym == KeyDebug ) {
DebugMode = !DebugMode; DebugMode = !DebugMode;
} }
else if ( Event.key.keysym.sym == KeyInventory ) { else if ( Event.key.keysym.sym == KeyInventory ) {
if ( InInventory ) { UsedKeys.Inventory = true;
InInventory = false;
} else {
InInventory = true;
}
} }
else if ( Event.key.keysym.sym == KeyGenFlatMap ) { else if ( Event.key.keysym.sym == KeyGenFlatMap ) {
SetSuperflatMap(); SetSuperflatMap();
@ -355,13 +354,13 @@ int main( int argc, char* args[] ) {
SetRandomNoiseMap(); SetRandomNoiseMap();
} }
else if ( Event.key.keysym.sym == KeyUp ) { else if ( Event.key.keysym.sym == KeyUp ) {
//UsedKeys.Up = true; UsedKeys.Up = true;
} }
else if ( Event.key.keysym.sym == KeyRight ) { else if ( Event.key.keysym.sym == KeyRight ) {
UsedKeys.Right = true; UsedKeys.Right = true;
} }
else if ( Event.key.keysym.sym == KeyDown ) { else if ( Event.key.keysym.sym == KeyDown ) {
//UsedKeys.Down = true; UsedKeys.Down = true;
} }
else if ( Event.key.keysym.sym == KeyLeft ) { else if ( Event.key.keysym.sym == KeyLeft ) {
UsedKeys.Left = true; UsedKeys.Left = true;
@ -380,11 +379,7 @@ int main( int argc, char* args[] ) {
} }
} }
} }
KeyListen(); EventHandle();
if ( InputTickTime % ( GameTick*4 ) == 0 ) {
EventHandle();
//Recalc = false;
}
if ( Recalc ) { if ( Recalc ) {
FillSurfRGB ( 0xFF, 0xFF, 0xFF, Screen ); FillSurfRGB ( 0xFF, 0xFF, 0xFF, Screen );
if ( InGame && !InInventory ) { if ( InGame && !InInventory ) {
@ -403,10 +398,8 @@ int main( int argc, char* args[] ) {
} }
Recalc = false; Recalc = false;
} }
printf("%d\n", InputTickTime);
SDL_Delay( CalcTimeLeft() ); SDL_Delay( CalcTimeLeft() );
NextTickTime += GameTick; NextTickTime += GameTick;
InputTickTime += GameTick;
} }
printf("[I] Exiting!\n"); printf("[I] Exiting!\n");