• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン286 (tree)
日時2007-05-05 18:47:58
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorOne/src/MapEditorSDI.cpp (revision 285)
+++ marathon/trunk/MapEditorOne/src/MapEditorSDI.cpp (revision 286)
@@ -436,18 +436,7 @@
436436 return this->editMode;
437437 }
438438
439-int CMapEditorSDIApp::getZoomDivision()
440-{
441- return this->zoomDivision;
442-}
443-void CMapEditorSDIApp::zoomIn()
444-{
445439
446-}
447-void CMapEditorSDIApp::zoomOut()
448-{
449-}
450-
451440 void loadIcon(int id, CImageList* imageList){
452441 HICON icon;
453442 icon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(id));
--- marathon/trunk/MapEditorOne/src/MapEditorOneInnerSetting.cpp (revision 285)
+++ marathon/trunk/MapEditorOne/src/MapEditorOneInnerSetting.cpp (revision 286)
@@ -7,17 +7,17 @@
77
88 mapeditorone::MapEditorOneInnerSetting::MapEditorOneInnerSetting(const char* tagNameFilePath, const char* dataFilePath)
99 {
10- ifstream ifs;
10+ std::ifstream ifs;
1111 ifs.open(tagNameFilePath);
1212 if(!ifs.is_open()){
13- MessageBox(L"Cannot open tag file", MB_OK);
13+ MessageBox(NULL, L"Cannot open tag file", L"", MB_OK);
1414 exit(-1);
1515 }
1616 ifs.close();
1717
1818 ifs.open(dataFilePath);
19- if(!ifs.is_open){
20- MessageBox(L"Cannot open inner data file", MB_OK);
19+ if(!ifs.is_open()){
20+ MessageBox(NULL, L"Cannot open inner data file", L"", MB_OK);
2121 exit(-1);
2222 }
2323 ifs.close();
@@ -31,10 +31,6 @@
3131 std::string mapeditorone::MapEditorOneInnerSetting::getString(int type)
3232 {
3333 std::string str = this->datas[type];
34- if(str == NULL){
35- MessageBox(L"Cannot find setting:", MB_OK);
36- exit(-1);
37- }
3834 return str;
3935 }
4036 int mapeditorone::MapEditorOneInnerSetting::getInt(int type)
--- marathon/trunk/HPLLib/HPLViewGridManager.cpp (revision 285)
+++ marathon/trunk/HPLLib/HPLViewGridManager.cpp (revision 286)
@@ -25,7 +25,7 @@
2525 */
2626 void hpl::aleph::view::HPLViewGridManager::zoomIn(int viewW, int viewH)
2727 {
28- this->addZoom(this->zoomProperties.zoomDivisionStep);
28+ this->addZoom(this->zoomProperties.zoomDivisionStep, viewW, viewH);
2929 }
3030
3131 /**
@@ -33,7 +33,7 @@
3333 */
3434 void hpl::aleph::view::HPLViewGridManager::zoomOut(int viewW, int viewH)
3535 {
36- this->addZoom(this->zoomProperties.zoomDivisionStep);
36+ this->addZoom(this->zoomProperties.zoomDivisionStep, viewW, viewH);
3737 }
3838
3939 /**
--- marathon/trunk/HPLLib/HPLViewGridManager.h (revision 285)
+++ marathon/trunk/HPLLib/HPLViewGridManager.h (revision 286)
@@ -39,7 +39,7 @@
3939 int zoomDivision;
4040
4141 /**View座標のオフセット*/
42- int viewOffset;
42+ int viewOffset[2];
4343 public:
4444 HPLViewGridManager(ZoomProperties *zoomProp);
4545 ~HPLViewGridManager();
--- marathon/trunk/HPLLib/HPLMapTool.h (revision 285)
+++ marathon/trunk/HPLLib/HPLMapTool.h (revision 286)
@@ -124,8 +124,7 @@
124124 <jp>壁情報をセットアップします
125125 <en>
126126 */
127- void fixSide(int leftPolyIndex, int rightPolyIndex, int sideIndex,
128- int lineIndex, bool isDeleteOldSide);
127+ void fixSide(int sideIndex);
129128
130129 ///////////////////////////////////////////////////////////////////////
131130 /////////// Groups //////////////////////////////////////////////////
旧リポジトリブラウザで表示