mirror of
https://git.themanaworld.org/mana/verse
synced 2026-08-16 04:23:07 -04:00
Fix new style issue detected by mplint.
new class() -> new class
This commit is contained in:
parent
bfc5d7483c
commit
4df1e68047
27 changed files with 59 additions and 59 deletions
|
|
@ -4496,7 +4496,7 @@ void Being::updateHit(const int amount) restrict2
|
|||
|
||||
Equipment *Being::getEquipment() restrict2
|
||||
{
|
||||
Equipment *restrict const eq = new Equipment();
|
||||
Equipment *restrict const eq = new Equipment;
|
||||
Equipment::Backend *restrict const bk = new BeingEquipBackend(this);
|
||||
eq->setBackend(bk);
|
||||
return eq;
|
||||
|
|
@ -4845,7 +4845,7 @@ void Being::addItemParticles(const int id,
|
|||
ParticleInfo *restrict pi = nullptr;
|
||||
if (it == mSpriteParticles.end())
|
||||
{
|
||||
pi = new ParticleInfo();
|
||||
pi = new ParticleInfo;
|
||||
mSpriteParticles[id] = pi;
|
||||
}
|
||||
else
|
||||
|
|
@ -4883,7 +4883,7 @@ void Being::addItemParticlesCards(const int id,
|
|||
ParticleInfo *restrict pi = nullptr;
|
||||
if (it == mSpriteParticles.end())
|
||||
{
|
||||
pi = new ParticleInfo();
|
||||
pi = new ParticleInfo;
|
||||
mSpriteParticles[id] = pi;
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ void CompoundSprite::redraw() const
|
|||
if (!surface)
|
||||
return;
|
||||
|
||||
SurfaceGraphics *graphics = new SurfaceGraphics();
|
||||
SurfaceGraphics *graphics = new SurfaceGraphics;
|
||||
graphics->setBlitMode(BlitMode::BLIT_GFX);
|
||||
graphics->setTarget(surface);
|
||||
graphics->beginDraw();
|
||||
|
|
@ -521,7 +521,7 @@ bool CompoundSprite::updateFromCache() const
|
|||
void CompoundSprite::initCurrentCacheItem() const
|
||||
{
|
||||
delete mCacheItem;
|
||||
mCacheItem = new CompoundItem();
|
||||
mCacheItem = new CompoundItem;
|
||||
mCacheItem->image = mImage;
|
||||
mCacheItem->alphaImage = mAlphaImage;
|
||||
// mCacheItem->alpha = mAlpha;
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ void stateChange(const StateT state)
|
|||
if (!mInventory)
|
||||
{
|
||||
mInventory = new Inventory(InventoryType::Inventory);
|
||||
mEquipment = new Equipment();
|
||||
mEquipment = new Equipment;
|
||||
mCartInventory = new Inventory(InventoryType::Cart);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ void PlayerRelationsManager::setRelation(const std::string &player_name,
|
|||
|
||||
StringVect *PlayerRelationsManager::getPlayers() const
|
||||
{
|
||||
StringVect *const retval = new StringVect();
|
||||
StringVect *const retval = new StringVect;
|
||||
|
||||
FOR_EACH (PlayerRelationsCIter, it, mRelations)
|
||||
{
|
||||
|
|
@ -377,7 +377,7 @@ StringVect *PlayerRelationsManager::getPlayers() const
|
|||
StringVect *PlayerRelationsManager::getPlayersByRelation(
|
||||
const RelationT rel) const
|
||||
{
|
||||
StringVect *const retval = new StringVect();
|
||||
StringVect *const retval = new StringVect;
|
||||
|
||||
FOR_EACH (PlayerRelationsCIter, it, mRelations)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -445,7 +445,7 @@ void Client::gameInit()
|
|||
emoteShortcut = new EmoteShortcut;
|
||||
dropShortcut = new DropShortcut;
|
||||
|
||||
gui = new Gui();
|
||||
gui = new Gui;
|
||||
gui->postInit(mainGraphics);
|
||||
dialogsManager = new DialogsManager;
|
||||
popupManager = new PopupManager;
|
||||
|
|
@ -527,7 +527,7 @@ void Client::gameInit()
|
|||
|
||||
#ifdef USE_MUMBLE
|
||||
if (!mumbleManager)
|
||||
mumbleManager = new MumbleManager();
|
||||
mumbleManager = new MumbleManager;
|
||||
#endif // USE_MUMBLE
|
||||
|
||||
mSkin = theme->load("windowmenu.xml", "");
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ void Client::gameInit()
|
|||
// emoteShortcut = new EmoteShortcut;
|
||||
// dropShortcut = new DropShortcut;
|
||||
|
||||
gui = new Gui();
|
||||
gui = new Gui;
|
||||
gui->postInit(mainGraphics);
|
||||
dialogsManager = new DialogsManager;
|
||||
popupManager = new PopupManager;
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ GraphicsManager::~GraphicsManager()
|
|||
#ifdef USE_OPENGL
|
||||
TestMain *GraphicsManager::startDetection()
|
||||
{
|
||||
TestMain *const test = new TestMain();
|
||||
TestMain *const test = new TestMain;
|
||||
test->exec(false);
|
||||
return test;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1228,7 +1228,7 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName)
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
ThemeInfo *const info = new ThemeInfo();
|
||||
ThemeInfo *const info = new ThemeInfo;
|
||||
|
||||
const std::string fontSize2("fontSize_" + mScreenDensity);
|
||||
const std::string npcfontSize2("npcfontSize_" + mScreenDensity);
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ void GuildManager::init()
|
|||
if (mEnableGuildBot)
|
||||
{
|
||||
if (!guildManager)
|
||||
guildManager = new GuildManager();
|
||||
guildManager = new GuildManager;
|
||||
else
|
||||
guildManager->reload();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -465,7 +465,7 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
|
|||
// Other
|
||||
else
|
||||
{
|
||||
newParticle = new Particle();
|
||||
newParticle = new Particle;
|
||||
newParticle->setMap(mMap);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -554,7 +554,7 @@ void ParticleEmitter::createParticles(const int tick,
|
|||
}
|
||||
else
|
||||
{
|
||||
newParticle = new Particle();
|
||||
newParticle = new Particle;
|
||||
newParticle->setMap(mMap);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ bool ParticleEngine::update() restrict2
|
|||
|
||||
Particle *ParticleEngine::createChild() restrict2
|
||||
{
|
||||
Particle *const newParticle = new Particle();
|
||||
Particle *const newParticle = new Particle;
|
||||
newParticle->setMap(mMap);
|
||||
mChildParticles.push_back(newParticle);
|
||||
return newParticle;
|
||||
|
|
@ -190,7 +190,7 @@ Particle *ParticleEngine::addEffect(const std::string &restrict
|
|||
// Other
|
||||
else
|
||||
{
|
||||
newParticle = new Particle();
|
||||
newParticle = new Particle;
|
||||
newParticle->setMap(mMap);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -690,7 +690,7 @@ void MobileOpenGL2Graphics::calcTileCollection(ImageCollection *
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -737,7 +737,7 @@ void MobileOpenGL2Graphics::calcPattern(ImageCollection *restrict const
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -839,7 +839,7 @@ void MobileOpenGL2Graphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -718,7 +718,7 @@ void MobileOpenGLGraphics::calcTileCollection(ImageCollection *
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -764,7 +764,7 @@ void MobileOpenGLGraphics::calcPattern(ImageCollection *restrict const vertCol,
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -866,7 +866,7 @@ void MobileOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -675,7 +675,7 @@ void ModernOpenGLGraphics::calcTileCollection(ImageCollection *
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -729,7 +729,7 @@ void ModernOpenGLGraphics::calcPattern(ImageCollection *restrict const vertCol,
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -827,7 +827,7 @@ void ModernOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -1044,7 +1044,7 @@ void NormalOpenGLGraphics::calcTileCollection(ImageCollection *
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -1091,7 +1091,7 @@ void NormalOpenGLGraphics::calcPattern(ImageCollection *restrict const vertCol,
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -1213,7 +1213,7 @@ void NormalOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -726,7 +726,7 @@ void NullOpenGLGraphics::calcTileCollection(ImageCollection *
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -770,7 +770,7 @@ void NullOpenGLGraphics::calcPattern(ImageCollection *restrict const vertCol,
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -933,7 +933,7 @@ void NullOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentGLImage != image->mGLImage)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentGLImage = image->mGLImage;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ void SDLGraphics::calcPatternInline(ImageVertexes *restrict const vert,
|
|||
const int dw = (px + iw >= w) ? w - px : iw;
|
||||
const int dstX = px + xOffset;
|
||||
|
||||
DoubleRect *const r = new DoubleRect();
|
||||
DoubleRect *const r = new DoubleRect;
|
||||
SDL_Rect &dstRect = r->dst;
|
||||
SDL_Rect &srcRect = r->src;
|
||||
srcRect.x = CAST_S32(srcX);
|
||||
|
|
@ -471,7 +471,7 @@ void SDLGraphics::calcPattern(ImageCollection *restrict const vertCol,
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -518,7 +518,7 @@ void SDLGraphics::calcTileSDL(ImageVertexes *restrict const vert,
|
|||
x += top.xOffset;
|
||||
y += top.yOffset;
|
||||
|
||||
DoubleRect *rect = new DoubleRect();
|
||||
DoubleRect *rect = new DoubleRect;
|
||||
SDL_Rect &dstRect = rect->dst;
|
||||
SDL_Rect &srcRect = rect->src;
|
||||
|
||||
|
|
@ -542,7 +542,7 @@ void SDLGraphics::calcTileCollection(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -612,7 +612,7 @@ void SDLGraphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -645,7 +645,7 @@ void SDL2SoftwareGraphics::calcPatternInline(ImageVertexes *
|
|||
const int dw = (px + iw >= w) ? w - px : iw;
|
||||
const int dstX = px + xOffset;
|
||||
|
||||
DoubleRect *const r = new DoubleRect();
|
||||
DoubleRect *const r = new DoubleRect;
|
||||
SDL_Rect &srcRect = r->src;
|
||||
srcRect.x = CAST_S16(srcX);
|
||||
srcRect.y = CAST_S16(srcY);
|
||||
|
|
@ -678,7 +678,7 @@ void SDL2SoftwareGraphics::calcPattern(ImageCollection *restrict const vertCol,
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -721,7 +721,7 @@ void SDL2SoftwareGraphics::calcTileSDL(ImageVertexes *restrict const vert,
|
|||
const ClipRect &top = mClipStack.top();
|
||||
const SDL_Rect &bounds = image->mBounds;
|
||||
|
||||
DoubleRect *rect = new DoubleRect();
|
||||
DoubleRect *rect = new DoubleRect;
|
||||
rect->src.x = CAST_S16(bounds.x);
|
||||
rect->src.y = CAST_S16(bounds.y);
|
||||
rect->src.w = CAST_U16(bounds.w);
|
||||
|
|
@ -749,7 +749,7 @@ void SDL2SoftwareGraphics::calcTileCollection(ImageCollection *
|
|||
return;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -820,7 +820,7 @@ void SDL2SoftwareGraphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -622,7 +622,7 @@ void SDLGraphics::calcPatternInline(ImageVertexes *restrict const vert,
|
|||
const int dw = (px + iw >= w) ? w - px : iw;
|
||||
const int dstX = px + xOffset;
|
||||
|
||||
DoubleRect *const r = new DoubleRect();
|
||||
DoubleRect *const r = new DoubleRect;
|
||||
SDL_Rect &srcRect = r->src;
|
||||
srcRect.x = CAST_S16(srcX);
|
||||
srcRect.y = CAST_S16(srcY);
|
||||
|
|
@ -656,7 +656,7 @@ void SDLGraphics::calcPattern(ImageCollection *restrict const vertCol,
|
|||
ImageVertexes *vert = nullptr;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -697,7 +697,7 @@ void SDLGraphics::calcTileSDL(ImageVertexes *restrict const vert,
|
|||
const ClipRect &top = mClipStack.top();
|
||||
const SDL_Rect &bounds = image->mBounds;
|
||||
|
||||
DoubleRect *rect = new DoubleRect();
|
||||
DoubleRect *rect = new DoubleRect;
|
||||
rect->src.x = CAST_S16(bounds.x);
|
||||
rect->src.y = CAST_S16(bounds.y);
|
||||
rect->src.w = CAST_U16(bounds.w);
|
||||
|
|
@ -723,7 +723,7 @@ void SDLGraphics::calcTileCollection(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
ImageVertexes *const vert = new ImageVertexes();
|
||||
ImageVertexes *const vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
@ -800,7 +800,7 @@ void SDLGraphics::calcWindow(ImageCollection *restrict const vertCol,
|
|||
return;
|
||||
if (vertCol->currentImage != image)
|
||||
{
|
||||
vert = new ImageVertexes();
|
||||
vert = new ImageVertexes;
|
||||
vertCol->currentImage = image;
|
||||
vertCol->currentVert = vert;
|
||||
vert->image = image;
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ void AtlasManager::simpleSort(const std::string &restrict name,
|
|||
int x = 0;
|
||||
int y = 0;
|
||||
int tempHeight = 0;
|
||||
TextureAtlas *atlas = new TextureAtlas();
|
||||
TextureAtlas *atlas = new TextureAtlas;
|
||||
std::vector<Image*>::const_iterator it = images.begin();
|
||||
const std::vector<Image*>::const_iterator it_end = images.end();
|
||||
for (it = images.begin(); it != it_end; ++ it)
|
||||
|
|
@ -247,7 +247,7 @@ void AtlasManager::simpleSort(const std::string &restrict name,
|
|||
x = 0;
|
||||
y = 0;
|
||||
atlases.push_back(atlas);
|
||||
atlas = new TextureAtlas();
|
||||
atlas = new TextureAtlas;
|
||||
atlas->name = std::string("atlas_").append(name).append(
|
||||
"_").append(img->getIdPath());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ static void loadQuest(const int var,
|
|||
{
|
||||
if (!node)
|
||||
return;
|
||||
QuestItem *const quest = new QuestItem();
|
||||
QuestItem *const quest = new QuestItem;
|
||||
// TRANSLATORS: quests window quest name
|
||||
quest->name = XML::langProperty(node, "name", _("unknown"));
|
||||
quest->group = XML::getProperty(node, "group", "");
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ IntMap *ItemInfo::addReplaceSprite(const int sprite,
|
|||
|
||||
if (!spMap)
|
||||
{
|
||||
spMap = new SpriteToItemMap();
|
||||
spMap = new SpriteToItemMap;
|
||||
mSpriteToItemReplaceMap[direction] = spMap;
|
||||
mSpriteToItemReplaceList.push_back(spMap);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ void MapLayer::updateSDL(const Graphics *const graphics,
|
|||
|
||||
for (int y = startY; y < endY; y++)
|
||||
{
|
||||
MapRowVertexes *const row = new MapRowVertexes();
|
||||
MapRowVertexes *const row = new MapRowVertexes;
|
||||
mTempRows.push_back(row);
|
||||
|
||||
const Image *lastImage = nullptr;
|
||||
|
|
@ -252,7 +252,7 @@ void MapLayer::updateSDL(const Graphics *const graphics,
|
|||
{
|
||||
if (lastImage != img)
|
||||
{
|
||||
imgVert = new ImageVertexes();
|
||||
imgVert = new ImageVertexes;
|
||||
imgVert->image = img;
|
||||
row->images.push_back(imgVert);
|
||||
lastImage = img;
|
||||
|
|
@ -293,7 +293,7 @@ void MapLayer::updateOGL(Graphics *const graphics,
|
|||
const int dx = mPixelX - scrollX;
|
||||
const int dy = mPixelY - scrollY;
|
||||
|
||||
MapRowVertexes *const row = new MapRowVertexes();
|
||||
MapRowVertexes *const row = new MapRowVertexes;
|
||||
mTempRows.push_back(row);
|
||||
Image *lastImage = nullptr;
|
||||
ImageVertexes *imgVert = nullptr;
|
||||
|
|
@ -330,7 +330,7 @@ void MapLayer::updateOGL(Graphics *const graphics,
|
|||
{
|
||||
if (lastImage)
|
||||
imgSet[lastImage->mGLImage] = imgVert;
|
||||
imgVert = new ImageVertexes();
|
||||
imgVert = new ImageVertexes;
|
||||
imgVert->ogl.init();
|
||||
imgVert->image = img;
|
||||
row->images.push_back(imgVert);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ void ObjectsLayer::addObject(const std::string &name, const int type,
|
|||
for (unsigned i = idx1; i < idx2; i ++)
|
||||
{
|
||||
if (!mTiles[i])
|
||||
mTiles[i] = new MapObjectList();
|
||||
mTiles[i] = new MapObjectList;
|
||||
mTiles[i]->objects.push_back(MapObject(type, name));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ SkillInfo::SkillInfo() :
|
|||
alwaysVisible(Visible_false),
|
||||
useTextParameter(false)
|
||||
{
|
||||
dataMap[0] = new SkillData();
|
||||
dataMap[0] = new SkillData;
|
||||
data = dataMap[0];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ void SpriteDef::addAction(const unsigned hp, const std::string &name,
|
|||
{
|
||||
const Actions::const_iterator i = mActions.find(hp);
|
||||
if (i == mActions.end())
|
||||
mActions[hp] = new ActionMap();
|
||||
mActions[hp] = new ActionMap;
|
||||
|
||||
(*mActions[hp])[name] = action;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue