Pokitto Community Team
A WIP Roguelike game by Adekto, VonBednat, Trelemar and Wuuff made for CGAJam in spring 2017
Dependencies: PokittoLib
Fork of
Arcade
by 
Pokitto Community Team
Revision 15:67fb7b0c1149, committed 2018-05-21
- Comitter:
- Pokitto
- Date:
- Mon May 21 18:04:18 2018 +0000
- Parent:
- 14:0ac3e6ae53f7
- Commit message:
- Compilation working now. Get music from: https://talk.pokitto.com/t/game-columns-coffins-roguelike-updated/482
Changed in this revision
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 My_settings.h --- a/My_settings.h Wed May 02 06:29:49 2018 +0000 +++ b/My_settings.h Mon May 21 18:04:18 2018 +0000 @@ -1,8 +1,8 @@ -/* This is an example of how to set your own project settings +/* This is an example of how to set your own project settings To use -1. make a copy of this file by pressing right mouse button on top of this file +1. make a copy of this file by pressing right mouse button on top of this file in the mbed online compiler, then choose "Clone" 2. See that the copy is in the root of the project (where your main cpp files are), not inside the PokittoLib folder @@ -13,6 +13,11 @@ */ #define PROJ_HIRES 1 -#define PROJ_ENABLE_SOUND 1 #define PROJ_GBSOUND 0 +#define PROJ_ENABLE_SOUND 1 // 0 = all sound functions disabled +#define PROJ_ENABLE_SYNTH 0 #define PROJ_STREAMING_MUSIC 1 +#define DISABLEAVRMIN 1 +#define PROJ_AUD_FREQ 11025 +#define PROJ_USE_PWM 0 // do not use PWM for sound FX +
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 PokittoLib.lib --- a/PokittoLib.lib Wed May 02 06:29:49 2018 +0000 +++ b/PokittoLib.lib Mon May 21 18:04:18 2018 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/users/Pokitto/code/PokittoLib/#2b8560b11eab +https://os.mbed.com/users/Pokitto/code/PokittoLib/#e7e438368e16
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 classes.cpp
--- a/classes.cpp Wed May 02 06:29:49 2018 +0000
+++ b/classes.cpp Mon May 21 18:04:18 2018 +0000
@@ -21,3 +21,4 @@
};
+
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 crapai.h
--- a/crapai.h Wed May 02 06:29:49 2018 +0000
+++ b/crapai.h Mon May 21 18:04:18 2018 +0000
@@ -144,3 +144,4 @@
return nocolide;
}
+
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 gui.h --- a/gui.h Wed May 02 06:29:49 2018 +0000 +++ b/gui.h Mon May 21 18:04:18 2018 +0000 @@ -110,3 +110,4 @@ } +
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 main.cpp
--- a/main.cpp Wed May 02 06:29:49 2018 +0000
+++ b/main.cpp Mon May 21 18:04:18 2018 +0000
@@ -122,6 +122,8 @@
#include "gui.h"
#include "crapai.h"
using namespace std;
+
+
int main () {
init_solids();
srand(SEED);
@@ -136,9 +138,12 @@
inventory.push_back("wuuff");
Ent Etemp(3,3);
ents.push_back(Etemp);
+pokInitSD(); // before game.begin if streaming
+game.sound.playMusicStream("coffins/coffins.snd"); // before game.begin if streaming
game.begin();
+game.sound.playMusicStream(); //after game.begin so that sound buffer is ready
game.display.setFont(font5x7);
-game.sound.playMusicStream("COFFINS.SND");
+
//mapgen(0,0,0,20,20);
game.display.loadRGBPalette(paletteCGA);
@@ -285,7 +290,7 @@
drawHP( playerHP);
- ents[0].draw();
+ //ents[0].draw();
game.display.drawBitmap(14*(7),14*(6),sprites[ID_PLAYER]);
@@ -299,3 +304,4 @@
return 1;
}
+
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 mapgen.c --- a/mapgen.c Wed May 02 06:29:49 2018 +0000 +++ b/mapgen.c Mon May 21 18:04:18 2018 +0000 @@ -361,3 +361,4 @@ */ +
diff -r 0ac3e6ae53f7 -r 67fb7b0c1149 sprites.h --- a/sprites.h Wed May 02 06:29:49 2018 +0000 +++ b/sprites.h Mon May 21 18:04:18 2018 +0000 @@ -2216,3 +2216,4 @@ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBF,0xBF,0xBF,0xBF,0xFF,0xFF,0xBF,0xBF,0xFF,0xFF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xFF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xBF,0xF7,0xFF,0xFF,0xFF,0x7F,0xFF,0xFF,0xF7, }; +