Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1301 Fix typos in comments/code.

Browse source
This commit is contained in:
dnk-88 2011-07-30 21:52:26 +03:00
parent 0ef659c13d
commit b0b2f3cdd6
6 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.cpp
View file

@ -1,6 +1,5 @@
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/> // Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited // Copyright (C) 2010 Winch Gate Property Limited
// Copyright (C) 2011 Dzmitry Kamiahin <dnk-88@tut.by>
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as // it under the terms of the GNU Affero General Public License as
@ -168,12 +167,12 @@ public:
return m_elements[m].y; return m_elements[m].y;
} }
BuilderZoneRegion* getBuilderZoneRegion(uint32 m) BuilderZoneRegion *getBuilderZoneRegion(uint32 m)
{ {
return m_elements[m].builderZoneRegion; return m_elements[m].builderZoneRegion;
} }
const std::string& getMat (uint32 m) const std::string &getMat (uint32 m)
{ {
return m_elements[m].matPut; return m_elements[m].matPut;
} }
@ -804,7 +803,7 @@ void BuilderZoneRegion::addTransition (sint32 x, sint32 y, uint8 rot, uint8 flip
} }
} }
void BuilderZoneRegion::addToUpdateAndCreate(BuilderZoneRegion* builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2) void BuilderZoneRegion::addToUpdateAndCreate(BuilderZoneRegion *builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2)
{ {
const NLLIGO::CZoneRegion &zoneRegion = m_zoneBuilder->zoneRegion(m_regionId)->ligoZoneRegion(); const NLLIGO::CZoneRegion &zoneRegion = m_zoneBuilder->zoneRegion(m_regionId)->ligoZoneRegion();
ToUpdate *ptCreate = reinterpret_cast<ToUpdate *>(pInt1); ToUpdate *ptCreate = reinterpret_cast<ToUpdate *>(pInt1);

3
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.h
View file

@ -1,6 +1,5 @@
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/> // Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited // Copyright (C) 2010 Winch Gate Property Limited
// Copyright (C) 2011 Dzmitry Kamiahin <dnk-88@tut.by>
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as // it under the terms of the GNU Affero General Public License as
@ -70,7 +69,7 @@ private:
void addTransition(sint32 x, sint32 y, uint8 rot, uint8 flip, NLLIGO::CZoneBankElement *zoneBankElement); void addTransition(sint32 x, sint32 y, uint8 rot, uint8 flip, NLLIGO::CZoneBankElement *zoneBankElement);
void addToUpdateAndCreate(BuilderZoneRegion* builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2); void addToUpdateAndCreate(BuilderZoneRegion *builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2);
void putTransitions(sint32 x, sint32 y, const NLLIGO::SPiece &mask, const std::string &matName, void *pInternal); void putTransitions(sint32 x, sint32 y, const NLLIGO::SPiece &mask, const std::string &matName, void *pInternal);
void updateTrans(sint32 x, sint32 y, NLLIGO::CZoneBankElement *zoneBankElement = NULL); void updateTrans(sint32 x, sint32 y, NLLIGO::CZoneBankElement *zoneBankElement = NULL);

18
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_constants.h
View file

@ -22,19 +22,19 @@ namespace LandscapeEditor
{ {
namespace Constants namespace Constants
{ {
const char * const LANDSCAPE_EDITOR_PLUGIN = "LandscapeEditor"; const char *const LANDSCAPE_EDITOR_PLUGIN = "LandscapeEditor";
//settings //settings
const char * const LANDSCAPE_EDITOR_SECTION = "LandscapeEditor"; const char *const LANDSCAPE_EDITOR_SECTION = "LandscapeEditor";
const char * const LANDSCAPE_WINDOW_STATE = "LandscapeWindowState"; const char *const LANDSCAPE_WINDOW_STATE = "LandscapeWindowState";
const char * const LANDSCAPE_WINDOW_GEOMETRY = "LandscapeWindowGeometry"; const char *const LANDSCAPE_WINDOW_GEOMETRY = "LandscapeWindowGeometry";
const char * const LANDSCAPE_DATA_DIRECTORY = "LandscapeDataDirectory"; const char *const LANDSCAPE_DATA_DIRECTORY = "LandscapeDataDirectory";
const char * const LANDSCAPE_USE_OPENGL = "LandscapeUseOpenGL"; const char *const LANDSCAPE_USE_OPENGL = "LandscapeUseOpenGL";
//resources //resources
const char * const ICON_LANDSCAPE_ITEM = ":/icons/ic_nel_landscape_item.png"; const char *const ICON_LANDSCAPE_ITEM = ":/icons/ic_nel_landscape_item.png";
const char * const ICON_ZONE_ITEM = ":/icons/ic_nel_zone.png"; const char *const ICON_ZONE_ITEM = ":/icons/ic_nel_zone.png";
const char * const ICON_LANDSCAPE_ZONES = ":/icons/ic_nel_zones.png"; const char *const ICON_LANDSCAPE_ZONES = ":/icons/ic_nel_zones.png";
} // namespace Constants } // namespace Constants

4
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.cpp
View file

@ -35,7 +35,7 @@ static const int ZONE_NAME = 0;
static const int LAYER_ZONES = 2; static const int LAYER_ZONES = 2;
static const int LAYER_EMPTY_ZONES = 3; static const int LAYER_EMPTY_ZONES = 3;
static const int LAYER_BLACKOUT = 4; static const int LAYER_BLACKOUT = 4;
const char * const LAYER_BLACKOUT_NAME = "blackout"; const char *const LAYER_BLACKOUT_NAME = "blackout";
const int MAX_SCENE_WIDTH = 256; const int MAX_SCENE_WIDTH = 256;
const int MAX_SCENE_HEIGHT = 256; const int MAX_SCENE_HEIGHT = 256;
@ -323,7 +323,7 @@ void LandscapeScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
QGraphicsScene::mousePressEvent(mouseEvent); QGraphicsScene::mousePressEvent(mouseEvent);
} }
void LandscapeScene::mouseMoveEvent(QGraphicsSceneMouseEvent * mouseEvent) void LandscapeScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent)
{ {
qreal x = mouseEvent->scenePos().x(); qreal x = mouseEvent->scenePos().x();
qreal y = mouseEvent->scenePos().y(); qreal y = mouseEvent->scenePos().y();

2
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.h
View file

@ -70,7 +70,7 @@ private:
QPixmap *getPixmap(const QString &zoneName) const; QPixmap *getPixmap(const QString &zoneName) const;
int m_scaleRatio; int m_scaleRatio;
QMap<QString, QPixmap*> m_pixmapMap; QMap<QString, QPixmap *> m_pixmapMap;
QStringList m_listNames; QStringList m_listNames;
}; };

2
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.h
View file

@ -61,7 +61,7 @@ public:
private: private:
int m_textureSize; int m_textureSize;
QMap<QString, QPixmap*> m_pixmapMap; QMap<QString, QPixmap *> m_pixmapMap;
}; };
} /* namespace LandscapeEditor */ } /* namespace LandscapeEditor */