diff --git a/programs/games/marblematch3/game/rs/rsplatform_kos.c b/programs/games/marblematch3/game/rs/rsplatform_kos.c index af06cd8361..82871110f4 100644 --- a/programs/games/marblematch3/game/rs/rsplatform_kos.c +++ b/programs/games/marblematch3/game/rs/rsplatform_kos.c @@ -68,7 +68,7 @@ void kol_wnd_resize(unsigned w, unsigned h) void wnd_draw() { - char tmp[] = "Fps:000 | Marble Match-3 Beta by Roman Shuvalov"; + char tmp[] = "Fps:000 | Marble Match-3 "; kol_paint_start(); diff --git a/programs/games/marblematch3/game/rsgame.c b/programs/games/marblematch3/game/rsgame.c index 7044c0893e..1f35d95d9e 100644 --- a/programs/games/marblematch3/game/rsgame.c +++ b/programs/games/marblematch3/game/rsgame.c @@ -646,11 +646,7 @@ void GameTerm() { void GameKeyDown(int key, int first) { - if (key == RS_KEY_A) { - - game.time = 50; - - }; + switch (key) { case RS_KEY_LEFT: @@ -704,28 +700,13 @@ void GameKeyDown(int key, int first) { if (game.status == STATUS_PLAYING) { - - #ifndef RS_KOS - if (key == RS_KEY_SPACE) { - game.score = 101; - }; - - #endif - if (key == RS_KEY_ESCAPE) { game.time = 0; game.score = 0; game.status = STATUS_MENU; game.need_redraw = 1; }; - - if (key == RS_KEY_A) { - soundbuf_play(&game.sound_bang); - }; -// if (key == RS_KEY_Z) { -// soundbuf_play(&game.sound_tack); -// }; - + }; }; diff --git a/programs/games/marblematch3/game/rsgame.h b/programs/games/marblematch3/game/rsgame.h index 565513254f..d96a9aa99f 100644 --- a/programs/games/marblematch3/game/rsgame.h +++ b/programs/games/marblematch3/game/rsgame.h @@ -211,6 +211,14 @@ typedef struct rs_game_t { extern rs_game_t game; void game_reg_init(); + + + + + + + + /* __ /cc\ /aaaa\ @@ -218,6 +226,10 @@ void game_reg_init(); \eeee/ ------------------------------- */ + + + + void GameProcess(); void game_ding(int i); diff --git a/programs/games/marblematch3/game/rsgametext.h b/programs/games/marblematch3/game/rsgametext.h index 8795dfbfa9..0e034fc3b6 100644 --- a/programs/games/marblematch3/game/rsgametext.h +++ b/programs/games/marblematch3/game/rsgametext.h @@ -5,23 +5,6 @@ #define GAME_COLORS_COUNT 8 -//#define GAME_COLOR_BLACK 0 -//#define GAME_COLOR_WHITE 1 -//#define GAME_COLOR_YELLOW 2 -//#define GAME_COLOR_RED 3 -//#define GAME_COLOR_BLUE 4 -//#define GAME_COLOR_ORANGE 5 -//#define GAME_COLOR_GRAY 6 -//#define GAME_COLOR_GREEN 7 -// -//#define GAME_FONT_DEFAULT 0 -//#define GAME_FONT_HEAVY 1 -//#define GAME_FONT_TITLE 2 -//#define GAME_FONT_LIGHT 3 -// -//#define GAME_ALIGN_LEFT 0 -//#define GAME_ALIGN_CENTER 1 -//#define GAME_ALIGN_RIGHT 2 void game_font_init(); diff --git a/programs/games/marblematch3/game/rskos.c b/programs/games/marblematch3/game/rskos.c index a5d44b668c..c2635b7fe3 100644 --- a/programs/games/marblematch3/game/rskos.c +++ b/programs/games/marblematch3/game/rskos.c @@ -265,33 +265,17 @@ void rskos_snd_stop(SNDBUF *hbuf) { void rskos_draw_area(int x, int y, int w, int h, int k_scale, unsigned char *data, unsigned char *scaled_buffer, int image_format) { -// unsigned char *scaled_buffer = malloc(w*k_scale*h*k_scale*3); - - -// if (scaled_buffer != NULL) { - - int i, j; - - for (i = 0; i < h*k_scale; i++) { - for (j = 0; j < w*k_scale; j++) { - scaled_buffer[ (i*w*k_scale + j)*3 + 0] = data[ ( (i/k_scale)*w + (j/k_scale) )*4 + 0]; - scaled_buffer[ (i*w*k_scale + j)*3 + 1] = data[ ( (i/k_scale)*w + (j/k_scale) )*4 + 1]; - scaled_buffer[ (i*w*k_scale + j)*3 + 2] = data[ ( (i/k_scale)*w + (j/k_scale) )*4 + 2]; - }; + int i, j; + + for (i = 0; i < h*k_scale; i++) { + for (j = 0; j < w*k_scale; j++) { + scaled_buffer[ (i*w*k_scale + j)*3 + 0] = data[ ( (i/k_scale)*w + (j/k_scale) )*4 + 0]; + scaled_buffer[ (i*w*k_scale + j)*3 + 1] = data[ ( (i/k_scale)*w + (j/k_scale) )*4 + 1]; + scaled_buffer[ (i*w*k_scale + j)*3 + 2] = data[ ( (i/k_scale)*w + (j/k_scale) )*4 + 2]; }; + }; - kol_paint_image(0, 0, w*k_scale, h*k_scale, scaled_buffer); -// } -// else { -// //kol_paint_image_pal(0, 0, w, h, data, &image_format) -// h/=4; -// asm volatile ("int $0x40"::"a"(65), "b"(data), "c"(w*65536+h), "d"(0*65536+0), "D"(0), "S"(24) ); -//// asm volatile ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(data)); -// }; -// -//// free(image_data); - - + kol_paint_image(0, 0, w*k_scale, h*k_scale, scaled_buffer); }; diff --git a/programs/games/marblematch3/game/strings.h b/programs/games/marblematch3/game/strings.h index c0a3f78e85..d2f7f8f6ef 100644 --- a/programs/games/marblematch3/game/strings.h +++ b/programs/games/marblematch3/game/strings.h @@ -2,7 +2,7 @@ #define RS_STRINGS_H #ifndef RS_KOS - #include "strings_ru.h" + #include "strings_en.h" #else #ifdef LANG_RU