mirror of
https://gitlab.com/dosowisko.net/libsuperderpy.git
synced 2025-02-01 19:16:44 +01:00
don't require C99 standard
This commit is contained in:
parent
7e4b6e7a14
commit
576a206f00
8 changed files with 50 additions and 37 deletions
2
Makefile
2
Makefile
|
@ -1,6 +1,6 @@
|
||||||
IDIR =.
|
IDIR =.
|
||||||
CC=gcc
|
CC=gcc
|
||||||
CFLAGS=-I$(IDIR) -std=gnu99 -Wall -DDEBUG -g
|
CFLAGS=-I$(IDIR) -Wall -g
|
||||||
|
|
||||||
SRCDIR=src
|
SRCDIR=src
|
||||||
ODIR=obj
|
ODIR=obj
|
||||||
|
|
|
@ -22,7 +22,8 @@ void About_Draw(struct Game *game) {
|
||||||
void About_Load(struct Game *game) {
|
void About_Load(struct Game *game) {
|
||||||
if (game->music) al_play_sample(game->about.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
if (game->music) al_play_sample(game->about.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=0; fadeloop<256; fadeloop+=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=0; fadeloop<256; fadeloop+=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
al_draw_tinted_bitmap(game->about.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
al_draw_tinted_bitmap(game->about.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
|
@ -126,7 +127,8 @@ void About_Unload(struct Game *game) {
|
||||||
al_draw_scaled_bitmap(game->about.letter,0,0,al_get_bitmap_width(game->about.letter),al_get_bitmap_height(game->about.letter),0,0,al_get_display_width(game->display), al_get_display_height(game->display),0);
|
al_draw_scaled_bitmap(game->about.letter,0,0,al_get_bitmap_width(game->about.letter),al_get_bitmap_height(game->about.letter),0,0,al_get_display_width(game->display), al_get_display_height(game->display),0);
|
||||||
al_draw_bitmap_region(game->about.text_bitmap, 0, game->about.x*al_get_bitmap_height(game->about.text_bitmap), al_get_bitmap_width(game->about.text_bitmap), al_get_display_height(game->display)*0.8, al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.1, 0);
|
al_draw_bitmap_region(game->about.text_bitmap, 0, game->about.x*al_get_bitmap_height(game->about.text_bitmap), al_get_bitmap_width(game->about.text_bitmap), al_get_display_height(game->display)*0.8, al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.1, 0);
|
||||||
al_set_target_bitmap(al_get_backbuffer(game->display));
|
al_set_target_bitmap(al_get_backbuffer(game->display));
|
||||||
for(int fadeloop=255; fadeloop>=0; fadeloop-=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=255; fadeloop>=0; fadeloop-=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
al_draw_tinted_bitmap(game->about.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);
|
al_draw_tinted_bitmap(game->about.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
/*! \brief One config option in list of options. */
|
/*! \brief One config option in list of options. */
|
||||||
struct ConfigOption {
|
struct ConfigOption {
|
||||||
|
@ -86,7 +87,8 @@ void InitConfig() {
|
||||||
new->value = malloc(sizeof(char)*255);
|
new->value = malloc(sizeof(char)*255);
|
||||||
new->value[0] = '\0';
|
new->value[0] = '\0';
|
||||||
new->next = NULL;
|
new->next = NULL;
|
||||||
for (int i=0; i<strlen(string); i++) {
|
int i;
|
||||||
|
for (i=0; i<strlen(string); i++) {
|
||||||
if (string[i]=='=') { before=false; continue; }
|
if (string[i]=='=') { before=false; continue; }
|
||||||
char temp[2];
|
char temp[2];
|
||||||
temp[0]=string[i];
|
temp[0]=string[i];
|
||||||
|
|
|
@ -37,7 +37,8 @@ void Intro_Draw(struct Game *game) {
|
||||||
void Intro_Load(struct Game *game) {
|
void Intro_Load(struct Game *game) {
|
||||||
if (game->music) al_play_sample(game->intro.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
if (game->music) al_play_sample(game->intro.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=0; fadeloop<256; fadeloop+=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=0; fadeloop<256; fadeloop+=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
al_draw_tinted_bitmap(game->intro.table,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
al_draw_tinted_bitmap(game->intro.table,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
|
@ -132,7 +133,8 @@ void Intro_Preload(struct Game *game) {
|
||||||
|
|
||||||
void Intro_Unload(struct Game *game) {
|
void Intro_Unload(struct Game *game) {
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=255; fadeloop>=0; fadeloop-=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=255; fadeloop>=0; fadeloop-=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
if (game->intro.in_animation)
|
if (game->intro.in_animation)
|
||||||
al_draw_tinted_bitmap(game->intro.table, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), -1*(game->intro.page)*al_get_display_width(game->display) + (cos(((-1*((game->intro.position)%al_get_display_width(game->display)))/(float)al_get_display_width(game->display))*(3.1415))/2.0)*al_get_display_width(game->display) + al_get_display_width(game->display)/2.0, 0, 0); //al_get_display_height(game->display)*((game->intro.position/3.0)/(float)al_get_display_width(game->display)), 0);
|
al_draw_tinted_bitmap(game->intro.table, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), -1*(game->intro.page)*al_get_display_width(game->display) + (cos(((-1*((game->intro.position)%al_get_display_width(game->display)))/(float)al_get_display_width(game->display))*(3.1415))/2.0)*al_get_display_width(game->display) + al_get_display_width(game->display)/2.0, 0, 0); //al_get_display_height(game->display)*((game->intro.position/3.0)/(float)al_get_display_width(game->display)), 0);
|
||||||
|
|
|
@ -33,7 +33,8 @@ void Level_Draw(struct Game *game) {
|
||||||
void Level_Load(struct Game *game) {
|
void Level_Load(struct Game *game) {
|
||||||
if (game->music) al_play_sample(game->level.sample, 0.75, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
if (game->music) al_play_sample(game->level.sample, 0.75, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=0; fadeloop<256; fadeloop+=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=0; fadeloop<256; fadeloop+=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
al_draw_tinted_bitmap(game->level.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
al_draw_tinted_bitmap(game->level.fade_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
|
@ -85,7 +86,8 @@ void Level_Unload(struct Game *game) {
|
||||||
al_draw_textf(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)/2, al_get_display_height(game->display)/2.2, ALLEGRO_ALIGN_CENTRE, "Level %d: Not implemented yet!", game->level.current_level);
|
al_draw_textf(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)/2, al_get_display_height(game->display)/2.2, ALLEGRO_ALIGN_CENTRE, "Level %d: Not implemented yet!", game->level.current_level);
|
||||||
al_draw_text(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)/2, al_get_display_height(game->display)/1.8, ALLEGRO_ALIGN_CENTRE, "Have some moonwalk instead.");
|
al_draw_text(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)/2, al_get_display_height(game->display)/1.8, ALLEGRO_ALIGN_CENTRE, "Have some moonwalk instead.");
|
||||||
al_set_target_bitmap(al_get_backbuffer(game->display));
|
al_set_target_bitmap(al_get_backbuffer(game->display));
|
||||||
for(int fadeloop=255; fadeloop>=0; fadeloop-=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=255; fadeloop>=0; fadeloop-=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
al_draw_tinted_bitmap(game->level.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);
|
al_draw_tinted_bitmap(game->level.fade_bitmap, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
|
|
|
@ -5,33 +5,34 @@
|
||||||
#include "loading.h"
|
#include "loading.h"
|
||||||
|
|
||||||
void Loading_Draw(struct Game *game) {
|
void Loading_Draw(struct Game *game) {
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=0; fadeloop<256; fadeloop+=10){
|
int fadeloop;
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
for(fadeloop=0; fadeloop<256; fadeloop+=10){
|
||||||
al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
DrawConsole(game);
|
al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
||||||
al_flip_display();
|
|
||||||
}
|
|
||||||
|
|
||||||
al_draw_bitmap(game->loading.loading_bitmap,0,0,0);
|
|
||||||
|
|
||||||
al_stop_timer(game->timer);
|
|
||||||
|
|
||||||
PreloadGameState(game);
|
|
||||||
|
|
||||||
al_start_timer(game->timer);
|
|
||||||
|
|
||||||
for(int fadeloop=255; fadeloop>0; fadeloop-=10){
|
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
|
||||||
al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
|
||||||
DrawConsole(game);
|
|
||||||
al_flip_display();
|
|
||||||
}
|
|
||||||
al_clear_to_color(al_map_rgb(0,0,0));
|
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
al_flip_display();
|
al_flip_display();
|
||||||
//al_rest(0.2);
|
}
|
||||||
LoadGameState(game);
|
|
||||||
|
al_draw_bitmap(game->loading.loading_bitmap,0,0,0);
|
||||||
|
|
||||||
|
al_stop_timer(game->timer);
|
||||||
|
|
||||||
|
PreloadGameState(game);
|
||||||
|
|
||||||
|
al_start_timer(game->timer);
|
||||||
|
|
||||||
|
for(fadeloop=255; fadeloop>0; fadeloop-=10){
|
||||||
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
|
al_draw_tinted_bitmap(game->loading.loading_bitmap,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
||||||
|
DrawConsole(game);
|
||||||
|
al_flip_display();
|
||||||
|
}
|
||||||
|
al_clear_to_color(al_map_rgb(0,0,0));
|
||||||
|
DrawConsole(game);
|
||||||
|
al_flip_display();
|
||||||
|
//al_rest(0.2);
|
||||||
|
LoadGameState(game);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Loading_Load(struct Game *game) {
|
void Loading_Load(struct Game *game) {
|
||||||
|
|
|
@ -43,7 +43,8 @@ void Map_Draw(struct Game *game) {
|
||||||
void Map_Load(struct Game *game) {
|
void Map_Load(struct Game *game) {
|
||||||
if (game->music) al_play_sample(game->map.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
if (game->music) al_play_sample(game->map.sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_LOOP, NULL);
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=0; fadeloop<256; fadeloop+=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=0; fadeloop<256; fadeloop+=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
al_draw_tinted_bitmap(game->map.map,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
al_draw_tinted_bitmap(game->map.map,al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1),0,0,0);
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
|
@ -114,7 +115,8 @@ void Map_Preload(struct Game *game) {
|
||||||
void Map_Unload(struct Game *game) {
|
void Map_Unload(struct Game *game) {
|
||||||
game->level.current_level = game->map.selected;
|
game->level.current_level = game->map.selected;
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=255; fadeloop>=0; fadeloop-=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=255; fadeloop>=0; fadeloop-=10){
|
||||||
al_wait_for_event(game->event_queue, &ev);
|
al_wait_for_event(game->event_queue, &ev);
|
||||||
al_draw_tinted_bitmap(game->map.map, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);
|
al_draw_tinted_bitmap(game->map.map, al_map_rgba_f(fadeloop/255.0,fadeloop/255.0,fadeloop/255.0,1), 0, 0, 0);
|
||||||
DrawConsole(game);
|
DrawConsole(game);
|
||||||
|
|
|
@ -150,7 +150,8 @@ void Menu_Unload(struct Game *game) {
|
||||||
game->menu.menu_fade_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));
|
game->menu.menu_fade_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));
|
||||||
|
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=255; fadeloop>=0; fadeloop-=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=255; fadeloop>=0; fadeloop-=10){
|
||||||
if ((game->menu.draw_while_fading) || (fadeloop==255)) {
|
if ((game->menu.draw_while_fading) || (fadeloop==255)) {
|
||||||
Menu_Draw(game);
|
Menu_Draw(game);
|
||||||
al_set_target_bitmap(game->menu.menu_fade_bitmap);
|
al_set_target_bitmap(game->menu.menu_fade_bitmap);
|
||||||
|
@ -190,7 +191,8 @@ void Menu_Load(struct Game *game) {
|
||||||
game->menu.menu_fade_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));
|
game->menu.menu_fade_bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display));
|
||||||
|
|
||||||
ALLEGRO_EVENT ev;
|
ALLEGRO_EVENT ev;
|
||||||
for(int fadeloop=0; fadeloop<256; fadeloop+=10){
|
int fadeloop;
|
||||||
|
for(fadeloop=0; fadeloop<256; fadeloop+=10){
|
||||||
if ((game->menu.draw_while_fading) || (fadeloop==0)) {
|
if ((game->menu.draw_while_fading) || (fadeloop==0)) {
|
||||||
Menu_Draw(game);
|
Menu_Draw(game);
|
||||||
al_set_target_bitmap(game->menu.menu_fade_bitmap);
|
al_set_target_bitmap(game->menu.menu_fade_bitmap);
|
||||||
|
|
Loading…
Reference in a new issue