[Stratagus-CVS] stratagus/src/ui icons.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/27 19:07:23

Modified files:
        src/ui         : icons.c 

Log message:
        Removed define-old-icon

Patches:
Index: stratagus/src/ui/icons.c
diff -u stratagus/src/ui/icons.c:1.49 stratagus/src/ui/icons.c:1.50
--- stratagus/src/ui/icons.c:1.49       Thu Oct  9 19:04:01 2003
+++ stratagus/src/ui/icons.c    Mon Oct 27 19:07:23 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: icons.c,v 1.49 2003/10/09 23:04:01 jsalmon3 Exp $
+//     $Id: icons.c,v 1.50 2003/10/28 00:07:23 jsalmon3 Exp $
 
 //@{
 
@@ -429,7 +429,7 @@
     int i;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: icons $Id: icons.c,v 1.49 2003/10/09 23:04:01 
jsalmon3 Exp $\n\n");
+    CLprintf(file, ";;; MODULE: icons $Id: icons.c,v 1.50 2003/10/28 00:07:23 
jsalmon3 Exp $\n\n");
 
     //
     //  Mapping the original icon numbers in puds to our internal strings
@@ -475,63 +475,6 @@
 **
 **     @param list     Icon definition list.
 */
-local SCM CclDefineOldIcon(SCM list)
-{
-    SCM value;
-    char* ident;
-    char* tileset;
-    char* str;
-    int n;
-
-#ifdef DEBUG
-    n = 0;
-#endif
-
-    //  Identifier
-
-    ident = gh_scm2newstr(gh_car(list), NULL);
-    list = gh_cdr(list);
-
-    //  Tileset
-
-    tileset = gh_scm2newstr(gh_car(list), NULL);
-    list = gh_cdr(list);
-
-    //  Type
-
-    value = gh_car(list);
-    list = gh_cdr(list);
-    if (gh_eq_p(value, gh_symbol2scm("normal"))) {
-       //      Normal icon - index, file
-       n = gh_scm2int(gh_car(list));
-       list = gh_cdr(list);
-       str = gh_scm2newstr(gh_car(list), NULL);
-       list = gh_cdr(list);
-
-    } else {
-       str = gh_scm2newstr(value, NULL);
-       fprintf(stderr, "%s: Wrong tag `%s'\n", ident, str);
-    }
-
-    if (!gh_null_p(list)) {
-       fprintf(stderr, "too much arguments\n");
-    }
-
-    DebugLevel3Fn("icon %s/%s %d of %s\n" _C_ ident _C_ tileset _C_ n _C_ str);
-
-    AddIcon(ident, tileset, n, IconWidth, IconHeight, str);
-    free(ident);
-    free(tileset);
-    free(str);
-
-    return SCM_UNSPECIFIED;
-}
-
-/**
-**     @brief Parse icon definition.
-**
-**     @param list     Icon definition list.
-*/
 local SCM CclDefineIcon(SCM list)
 {
     SCM value;
@@ -670,7 +613,6 @@
 */
 global void IconCclRegister(void)
 {
-    gh_new_procedureN("define-old-icon", CclDefineOldIcon);
     gh_new_procedureN("define-icon", CclDefineIcon);
     gh_new_procedure2_0("define-icon-alias", CclDefineIconAlias);