80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

Merge branch 'master' of github.com:laochailan/taisei

Browse source
This commit is contained in:
laochailan 2012-08-11 14:25:31 +02:00
commit 6cac793550
7 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
sfx/generic_shot.wav Normal file
View file

Binary file not shown.

8
src/CMakeLists.txt
View file

@ -103,8 +103,14 @@ endif()
if(WIN32)
set(LIBs ${LIBs} -ldxguid -lwinmm)
string(REPLACE "gcc" "windres" CMAKE_RC_COMPILER_INIT ${CMAKE_C_COMPILER})
enable_language(RC)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -o <OBJECT> <SOURCE>")
set(SRCs ${SRCs} taisei.rc)
endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SDL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
add_executable(taisei WIN32 ${SRCs})
target_link_libraries(taisei ${LIBs})

4
src/player.c
View file

@ -171,7 +171,7 @@ void player_logic(Player* plr) {
}
void player_bomb(Player *plr) {
if(global.frames - plr->recovery >= 0 && plr->bombs > 0) {
if(global.frames - plr->recovery >= 0 && plr->bombs > 0 && global.frames - plr->respawntime >= 60) {
delete_projectiles(&global.projs);
@ -197,7 +197,7 @@ void player_bomb(Player *plr) {
void player_realdeath(Player *plr) {
plr->deathtime = -DEATH_DELAY-1;
plr->respawntime = global.frames;
plr->moveflags = 0;
create_item(plr->pos, 6-15*I, Power);

1
src/player.h
View file

@ -51,6 +51,7 @@ typedef struct {
int recovery;
int deathtime;
int respawntime;
int continues;

7
src/plrmodes.c
View file

@ -187,6 +187,10 @@ int youmu_split(Enemy *e, int t) {
void youmu_shot(Player *plr) {
if(plr->fire) {
if(!(global.frames % 4))
play_sound("generic_shot");
if(!(global.frames % 6)) {
create_projectile1c("youmu", plr->pos + 10 - I*20, NULL, linear, -20I)->type = PlrProj+120;
create_projectile1c("youmu", plr->pos - 10 - I*20, NULL, linear, -20I)->type = PlrProj+120;
@ -407,6 +411,9 @@ int marisa_star_orbit(Projectile *p, int t) { // a[0]: x' a[1]: x''
void marisa_shot(Player *plr) {
if(plr->fire) {
if(!(global.frames % 4))
play_sound("generic_shot");
if(!(global.frames % 6)) {
create_projectile1c("marisa", plr->pos + 10 - 15I, NULL, linear, -20I)->type = PlrProj+150;
create_projectile1c("marisa", plr->pos - 10 - 15I, NULL, linear, -20I)->type = PlrProj+150;

BIN
src/taisei.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 85 KiB

1
src/taisei.rc Normal file
View file

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "taisei.ico"