Ignore:
Timestamp:
Sep 18, 2011, 11:01:26 PM (10 years ago)
Author:
sam
Message:

osx: automake does not support .mm files yet, so rename ios-image.mm back
to ios-image.cpp, but disable it on OS X because UIKit isn't available.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/monsterz/title.cpp

    r866 r958  
    353353    /* Maybe an animation? */
    354354    TileSet *tiler = NULL;
    355     int id = 0;
     355    int tileid = 0;
    356356    ivec2 pos = 0;
    357357
     
    364364        pos = animpos[data->animid];
    365365        pos.y = 384 - animsize[data->animid].y - pos.y; // Hack
    366         id = (data->length - data->timer) * data->nframes / data->length;
    367         if (id < 0) id = 0;
    368         if (id > data->nframes - 1) id = data->nframes - 1;
     366        tileid = (data->length - data->timer) * data->nframes / data->length;
     367        if (tileid < 0) tileid = 0;
     368        if (tileid > data->nframes - 1) tileid = data->nframes - 1;
    369369        break;
    370370    case TitleData::EVENT:
     
    372372        pos = eventpos[data->animid];
    373373        pos.y = 384 - eventsize[data->animid].y - pos.y; // Hack
    374         id = (data->length - data->timer) * data->nframes / data->length;
    375         if (id < 0) id = 0;
    376         if (id > data->nframes - 1) id = data->nframes - 1;
     374        tileid = (data->length - data->timer) * data->nframes / data->length;
     375        if (tileid < 0) tileid = 0;
     376        if (tileid > data->nframes - 1) tileid = data->nframes - 1;
    377377        break;
    378378    }
    379379    if (tiler)
    380         Scene::GetDefault()->AddTile(tiler, id,
     380        Scene::GetDefault()->AddTile(tiler, tileid,
    381381                                     ivec3(data->ground_pos.x + pos.x,
    382382                                           data->ground_pos.y + pos.y, 1), 0);
Note: See TracChangeset for help on using the changeset viewer.