← Back to branch summary

~ubuntu-branches/ubuntu/natty/smc/natty

« back to all changes in this revision

Viewing changes to src/enemies/spika.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Muammar El Khatib
  • Date: 2009-01-30 14:20:20 UTC
  • mfrom: (1.1.5 upstream) (5.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090130142020-slza1cg603t34uyq
Tags: 1.7-1
http://bugs.debian.org/511404
http://bugs.debian.org/508106
http://bugs.debian.org/511660
http://bugs.debian.org/512841
* New upstream release. (Closes: #511404)
* debian/control: smc Build-Depends on libboost-filesystem1.37-dev instead of
  libboost-filesystem-dev.
* debian/control: dpatch build dependency has been added in order to make the
  update of libboost-filesystem1.37-dev.
* smc is not failing anymore with undefined symbol error in CEGUI. Problem was
  caused by a missed directory called translations under /usr/share/games/smc/
  (Closes: #508106)
* smc now suggests smc-music. Thanks to Alessio Treglia for reporting this.
  (Closes: #511660)
* Bug 'Segmentation fault on startup' is no longer present in this new 
  upstream version.  (Closes: #512841)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/enemies/spika.cpp
47
47
{
48
48
        type = TYPE_SPIKA;
49
49
        posz = 0.09f;
50
 
        can_be_ground = 1;
51
50
 
52
51
        color_type = COL_DEFAULT;
53
52
        speed = 0;
331
330
        }
332
331
        if( obj->massivetype == MASS_HALFMASSIVE )
333
332
        {
334
 
                // if moving downwards and object is on top
 
333
                // if moving downwards and the object is on bottom
335
334
                if( vely >= 0 && Is_on_Top( obj ) )
336
335
                {
337
336
                        return 2;
343
342
 
344
343
void cSpika :: Handle_Collision_Player( cObjectCollision *collision )
345
344
{
346
 
        pPlayer->DownGrade();
 
345
        pPlayer->DownGrade_Player();
347
346
 
348
347
        if( collision->direction == DIR_LEFT || collision->direction == DIR_RIGHT )
349
348
        {
416
415
        {
417
416
                velx = 0;
418
417
        }
 
418
 
 
419
        Send_Collision( collision );
419
420
}
420
421
 
421
422
void cSpika :: Handle_Collision_Box( ObjectDirection cdirection, GL_rect *r2 )