[Super-tux-commit] supertux/src badguy.cpp,1.11,1.12 gameloop.cpp,1.21,1.22 player.cpp,1.9,1.10 play
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src badguy.cpp,1.11,1.12 gameloop.cpp,1.21,1.22 player.cpp,1.9,1.10 player.h,1.17,1.18
|
From: Ingo R. <gr...@us...> - 2004-03-24 22:21:11
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11965 Modified Files: badguy.cpp gameloop.cpp player.cpp player.h Log Message: - renamed input/input_ Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- player.cpp 24 Mar 2004 21:43:56 -0000 1.9 +++ player.cpp 24 Mar 2004 22:10:28 -0000 1.10 @@ -79,7 +79,7 @@ score = 0; distros = 0; - player_input_init(&input_); + player_input_init(&input); keymap.jump = SDLK_UP; keymap.duck = SDLK_DOWN; @@ -100,27 +100,27 @@ { if(key == keymap.right) { - input_.right = state; + input.right = state; return true; } else if(key == keymap.left) { - input_.left = state; + input.left = state; return true; } else if(key == keymap.jump) { - input_.up = state; + input.up = state; return true; } else if(key == keymap.duck) { - input_.down = state; + input.down = state; return true; } else if(key == keymap.fire) { - input_.fire = state; + input.fire = state; return true; } else @@ -136,7 +136,7 @@ base.ym = 0; old_base = base; - player_input_init(&input_); + player_input_init(&input); timer_init(&invincible_timer,true); timer_init(&skidding_timer,true); @@ -153,7 +153,7 @@ /* --- HANDLE TUX! --- */ - input(); + handle_input(); /* Move tux: */ @@ -387,7 +387,7 @@ { /* Facing the direction we're jumping? Go full-speed: */ - if (input_.fire == UP) + if (input.fire == UP) { base.xm = base.xm + ( newdir ? WALK_SPEED : -WALK_SPEED) * frame_ratio; @@ -402,7 +402,7 @@ base.xm = -MAX_WALK_XM; } } - else if ( input_.fire == DOWN) + else if ( input.fire == DOWN) { base.xm = base.xm + ( newdir ? RUN_SPEED : -RUN_SPEED) * frame_ratio; @@ -443,7 +443,7 @@ void Player::handle_vertical_input() { - if(input_.up == DOWN) + if(input.up == DOWN) { if (on_ground()) { @@ -460,7 +460,7 @@ } } } - else if(input_.up == UP && jumping) + else if(input.up == UP && jumping) { if (on_ground()) { @@ -490,17 +490,16 @@ } void -Player::input() +Player::handle_input() { /* Handle key and joystick state: */ - if(duck == false) { - if (input_.right == DOWN && input_.left == UP) + if (input.right == DOWN && input.left == UP) { handle_horizontal_input(RIGHT); } - else if (input_.left == DOWN && input_.right == UP) + else if (input.left == DOWN && input.right == UP) { handle_horizontal_input(LEFT); } @@ -523,14 +522,14 @@ /* Jump/jumping? */ - if ( input_.up == DOWN || (input_.up == UP && jumping)) + if ( input.up == DOWN || (input.up == UP && jumping)) { handle_vertical_input(); } /* Shoot! */ - if (input_.fire == DOWN && input_.old_fire == UP && got_coffee) + if (input.fire == DOWN && input.old_fire == UP && got_coffee) { add_bullet(base.x, base.y, base.xm, dir); } @@ -538,7 +537,7 @@ /* Duck! */ - if (input_.down == DOWN) + if (input.down == DOWN) { if (size == BIG && duck != true) { @@ -579,14 +578,14 @@ if(!timer_check(&frame_timer)) { timer_start(&frame_timer,25); - if (input_.right == UP && input_.left == UP) + if (input.right == UP && input.left == UP) { frame_main = 1; frame_ = 1; } else { - if ((input_.fire == DOWN && (global_frame_counter % 2) == 0) || + if ((input.fire == DOWN && (global_frame_counter % 2) == 0) || (global_frame_counter % 4) == 0) frame_main = (frame_main + 1) % 4; @@ -835,7 +834,7 @@ !timer_started(&safe_timer) && pbad_c->mode != HELD) { - if (pbad_c->mode == FLAT && input_.fire != DOWN) + if (pbad_c->mode == FLAT && input.fire != DOWN) { /* Kick: */ @@ -855,7 +854,7 @@ timer_start(&pbad_c->timer,5000); } - else if (pbad_c->mode == FLAT && input_.fire == DOWN) + else if (pbad_c->mode == FLAT && input.fire == DOWN) { pbad_c->mode = HELD; pbad_c->base.y-=8; Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- player.h 24 Mar 2004 17:41:04 -0000 1.17 +++ player.h 24 Mar 2004 22:10:29 -0000 1.18 @@ -87,7 +87,7 @@ class Player { public: - player_input_type input_; + player_input_type input; player_keymap_type keymap; int score; int distros; @@ -115,7 +115,7 @@ int key_event(SDLKey key, int state); void level_begin(); void action(); - void input(); + void handle_input(); void grabdistros(); void draw(); void collision(void* p_c_object, int c_object); Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- gameloop.cpp 24 Mar 2004 21:43:56 -0000 1.21 +++ gameloop.cpp 24 Mar 2004 22:10:28 -0000 1.22 @@ -236,32 +236,32 @@ case JOY_X: if (event.jaxis.value < -JOYSTICK_DEAD_ZONE) { - tux.input_.left = DOWN; - tux.input_.right = UP; + tux.input.left = DOWN; + tux.input.right = UP; } else if (event.jaxis.value > JOYSTICK_DEAD_ZONE) { - tux.input_.left = UP; - tux.input_.right = DOWN; + tux.input.left = UP; + tux.input.right = DOWN; } else { - tux.input_.left = DOWN; - tux.input_.right = DOWN; + tux.input.left = DOWN; + tux.input.right = DOWN; } break; case JOY_Y: if (event.jaxis.value > JOYSTICK_DEAD_ZONE) - tux.input_.down = DOWN; + tux.input.down = DOWN; else if (event.jaxis.value < -JOYSTICK_DEAD_ZONE) - tux.input_.down = UP; + tux.input.down = UP; else - tux.input_.down = UP; + tux.input.down = UP; /* Handle joystick for the menu */ if(show_menu) { - if(tux.input_.down == DOWN) + if(tux.input.down == DOWN) menuaction = MENU_ACTION_DOWN; else menuaction = MENU_ACTION_UP; @@ -273,15 +273,15 @@ break; case SDL_JOYBUTTONDOWN: if (event.jbutton.button == JOY_A) - tux.input_.up = DOWN; + tux.input.up = DOWN; else if (event.jbutton.button == JOY_B) - tux.input_.fire = DOWN; + tux.input.fire = DOWN; break; case SDL_JOYBUTTONUP: if (event.jbutton.button == JOY_A) - tux.input_.up = UP; + tux.input.up = UP; else if (event.jbutton.button == JOY_B) - tux.input_.fire = UP; + tux.input.fire = UP; if(show_menu) menuaction = MENU_ACTION_HIT; @@ -625,7 +625,7 @@ /* Handle events: */ - tux.input_.old_fire = tux.input_.fire; + tux.input.old_fire = tux.input.fire; game_event(); Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- badguy.cpp 24 Mar 2004 22:01:08 -0000 1.11 +++ badguy.cpp 24 Mar 2004 22:10:28 -0000 1.12 @@ -160,7 +160,7 @@ base.y = tux.base.y + tux.base.height/1.5 - base.height; } - if(tux.input_.fire != DOWN) /* SHOOT! */ + if(tux.input.fire != DOWN) /* SHOOT! */ { if(dir == LEFT) base.x -= 24; |
