[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src include/pud.h ui/menus.c
From: |
Russell Smith |
Subject: |
[Stratagus-CVS] stratagus/src include/pud.h ui/menus.c |
Date: |
Wed, 29 Oct 2003 08:08:38 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/10/29 08:08:38
Modified files:
src/include : pud.h
src/ui : menus.c
Log message:
More map format cleanup
Patches:
Index: stratagus/src/include/pud.h
diff -u stratagus/src/include/pud.h:1.25 stratagus/src/include/pud.h:1.26
--- stratagus/src/include/pud.h:1.25 Wed Oct 29 07:58:35 2003
+++ stratagus/src/include/pud.h Wed Oct 29 08:08:35 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: pud.h,v 1.25 2003/10/29 12:58:35 mr-russ Exp $
+// $Id: pud.h,v 1.26 2003/10/29 13:08:35 mr-russ Exp $
#ifndef __PUD_H__
#define __PUD_H__
@@ -94,10 +94,6 @@
/// Return info for pud
extern MapInfo* GetPudInfo(const char*);
- /// Return info for scm
-extern MapInfo* GetScmInfo(const char*);
- /// Return info for chk
-extern MapInfo* GetChkInfo(const char*);
/// Load a pud file
extern void LoadPud(const char* pud,WorldMap* map);
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.581 stratagus/src/ui/menus.c:1.582
--- stratagus/src/ui/menus.c:1.581 Wed Oct 29 07:44:37 2003
+++ stratagus/src/ui/menus.c Wed Oct 29 08:08:36 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menus.c,v 1.581 2003/10/29 12:44:37 mr-russ Exp $
+// $Id: menus.c,v 1.582 2003/10/29 13:08:36 mr-russ Exp $
//@{
@@ -2729,12 +2729,6 @@
if (strcasestr(ScenSelectFileName, ".pud")) {
MenuMapInfo = GetPudInfo(ScenSelectPath);
strcpy(MenuMapFullPath, ScenSelectPath);
- } else if (strcasestr(ScenSelectFileName, ".scm")) {
- MenuMapInfo = GetScmInfo(ScenSelectPath);
- strcpy(MenuMapFullPath, ScenSelectPath);
- } else if (strcasestr(ScenSelectFileName, ".chk")) {
- MenuMapInfo = GetChkInfo(ScenSelectPath);
- strcpy(MenuMapFullPath, ScenSelectPath);
} else {
// FIXME: GetCmInfo();
}
@@ -3471,36 +3465,6 @@
FreeMapInfo(info);
}
}
- } else {
- if (strcasestr(np, ".scm")) {
- info = GetScmInfo(pathbuf);
- if (info) {
- DebugLevel3Fn("GetScmInfo(%s) : %p\n" _C_ pathbuf _C_
info);
- sz = szl[menu->Items[8].d.pulldown.curopt];
- if (sz < 0 || (info->MapWidth == sz && info->MapHeight
== sz)) {
- fl->type = 1;
- fl->name = strdup(np);
- fl->xdata = info;
- return 1;
- } else {
- FreeMapInfo(info);
- }
- }
- } else {
- info = GetChkInfo(pathbuf);
- if (info) {
- DebugLevel3Fn("GetChkInfo(%s) : %p\n" _C_ pathbuf _C_
info);
- sz = szl[menu->Items[8].d.pulldown.curopt];
- if (sz < 0 || (info->MapWidth == sz && info->MapHeight
== sz)) {
- fl->type = 1;
- fl->name = strdup(np);
- fl->xdata = info;
- return 1;
- } else {
- FreeMapInfo(info);
- }
- }
- }
}
}
}
@@ -5061,10 +5025,6 @@
if (strcasestr(ScenSelectFileName, ".pud")) {
MenuMapInfo = GetPudInfo(MenuMapFullPath);
- } else if (strcasestr(ScenSelectFileName, ".scm")) {
- MenuMapInfo = GetScmInfo(MenuMapFullPath);
- } else if (strcasestr(ScenSelectFileName, ".chk")) {
- MenuMapInfo = GetChkInfo(MenuMapFullPath);
} else {
// FIXME: GetCmInfo();
}
@@ -5483,22 +5443,6 @@
#endif
if (strcasestr(np, ".pud")) {
info = GetPudInfo(pathbuf);
- if (info) {
- fl->type = 1;
- fl->name = strdup(np);
- fl->xdata = info;
- return 1;
- }
- } else if (strcasestr(np, ".scm")) {
- info = GetScmInfo(pathbuf);
- if (info) {
- fl->type = 1;
- fl->name = strdup(np);
- fl->xdata = info;
- return 1;
- }
- } else {
- info = GetChkInfo(pathbuf);
if (info) {
fl->type = 1;
fl->name = strdup(np);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src include/pud.h ui/menus.c,
Russell Smith <=