summaryrefslogtreecommitdiff
path: root/src/common/mapindex.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/mapindex.c')
-rw-r--r--src/common/mapindex.c120
1 files changed, 61 insertions, 59 deletions
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 0c3faec75..d0843017e 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -1,14 +1,16 @@
-#include "mmo.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include "showmsg.h"
+
+#include "mapindex.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
#include "../common/malloc.h"
#define MAX_MAPINDEX 2000
//Leave an extra char of space to hold the terminator, in case for the strncpy(mapindex_id2name()) calls.
-struct {
+struct indexes {
char name[MAP_NAME_LENGTH+1]; //Stores map name
int length; //Stores string length WITHOUT the extension for quick lookup.
} indexes[MAX_MAPINDEX];
@@ -17,6 +19,52 @@ static unsigned short max_index = 0;
char mapindex_cfgfile[80] = "db/map_index.txt";
+/// Adds a map to the specified index
+/// Returns 1 if successful, 0 oherwise
+static int mapindex_addmap(int index, const char *name)
+{
+ char map_name[1024];
+ char *ext;
+ int length;
+
+ if (index < 0 || index >= MAX_MAPINDEX) {
+ ShowError("(mapindex_add) Map index (%d) for \"%s\" out of range (max is %d)\n", index, name, MAX_MAPINDEX);
+ return 0;
+ }
+ snprintf(map_name, 1024, "%s", name);
+ map_name[1023] = 0;
+ length = strlen(map_name);
+ if (length > MAP_NAME_LENGTH) {
+ ShowError("(mapindex_add) Map name %s is too long. Maps are limited to %d characters.\n", map_name, MAP_NAME_LENGTH);
+ return 0;
+ }
+ if ((ext = strstr(map_name, ".gat")) != NULL) { //Gat map
+ length = ext-map_name;
+ } else if ((ext = strstr(map_name, ".afm")) != NULL || (ext = strstr(map_name, ".af2")) != NULL) { //afm map
+ length = ext-map_name;
+ sprintf(ext, ".gat"); //Change the extension to gat
+ } else if ((ext = strstr(map_name, ".")) != NULL) { //Generic extension?
+ length = ext-map_name;
+ sprintf(ext, ".gat");
+ } else { //No extension?
+ length = strlen(map_name);
+ strcat(map_name, ".gat");
+ }
+ if (length > MAP_NAME_LENGTH - 4) {
+ ShowError("(mapindex_add) Adjusted Map name %s is too long. Maps are limited to %d characters.\n", map_name, MAP_NAME_LENGTH);
+ return 0;
+ }
+
+ if (indexes[index].length)
+ ShowWarning("(mapindex_add) Overriding index %d: map \"%s\" -> \"%s\"\n", indexes[index].name, map_name);
+
+ strncpy(indexes[index].name, map_name, MAP_NAME_LENGTH);
+ indexes[index].length = length;
+ if (max_index <= index)
+ max_index = index+1;
+ return 1;
+}
+
unsigned short mapindex_name2id(char* name) {
//TODO: Perhaps use a db to speed this up? [Skotlex]
int i;
@@ -30,32 +78,20 @@ unsigned short mapindex_name2id(char* name) {
return i;
}
#ifdef MAPINDEX_AUTOADD
- if (i < MAX_MAPINDEX) {
- char map_name[MAP_NAME_LENGTH+5];
- length = strlen(name);
- if (length > MAP_NAME_LENGTH)
- return;
- memcpy(map_name, name, length+1);
- if ((ext = strstr(map_name, ".")) != NULL) {
- length = ext-map_name;
- sprintf(ext, ".gat");
- } else { //No extension?
- length = strlen(map_name);
- strcat(map_name, ".gat");
- }
- if (length > MAP_NAME_LENGTH - 4)
- return 0; //Can't be added.
- strncpy(indexes[i].name, map_name, MAP_NAME_LENGTH);
- indexes[i].length = strlen(map_name);
- ShowDebug("mapindex_name2id: Added map \"%s\" to position %d\n", indexes[i], i);
+ if( mapindex_addmap(i,name) )
+ {
+ ShowDebug("mapindex_name2id: Auto-added map \"%s\" to position %d\n", indexes[i], i);
return i;
}
-#endif
+ ShowWarning("mapindex_name2id: Failed to auto-add map \"%s\" to position %d!\n", name, i);
+ return 0;
+#else
ShowDebug("mapindex_name2id: Map \"%s\" not found in index list!\n", name);
return 0;
+#endif
}
-char* mapindex_id2name(unsigned short id) {
+const char* mapindex_id2name(unsigned short id) {
if (id > MAX_MAPINDEX || !indexes[id].length) {
ShowDebug("mapindex_id2name: Requested name for non-existant map index [%d] in cache.\n", id);
return indexes[0].name; //Theorically this should never happen, hence we return this string to prevent null pointer crashes.
@@ -66,9 +102,8 @@ char* mapindex_id2name(unsigned short id) {
void mapindex_init(void) {
FILE *fp;
char line[1024];
- char *ext;
int last_index = -1;
- int index, length;
+ int index;
char map_name[1024];
malloc_tsetdword (&indexes, 0, sizeof (indexes));
@@ -85,39 +120,7 @@ void mapindex_init(void) {
case 1: //Map with no ID given, auto-assign
index = last_index+1;
case 2: //Map with ID given
- if (index < 0 || index >= MAX_MAPINDEX) {
- ShowError("(mapindex_init) Map index (%d) for \"%s\" out of range (max is %d)\n", index, map_name, MAX_MAPINDEX);
- continue;
- }
- length = strlen(map_name);
- if (length > MAP_NAME_LENGTH) {
- ShowError("(mapindex_init) Map name %s is too long. Maps are limited to %d characters.\n", map_name, MAP_NAME_LENGTH);
- continue;
- }
- if ((ext = strstr(map_name, ".gat")) != NULL) { //Gat map
- length = ext-map_name;
- } else if ((ext = strstr(map_name, ".afm")) != NULL || (ext = strstr(map_name, ".af2")) != NULL) { //afm map
- length = ext-map_name;
- sprintf(ext, ".gat"); //Change the extension to gat
- } else if ((ext = strstr(map_name, ".")) != NULL) { //Generic extension?
- length = ext-map_name;
- sprintf(ext, ".gat");
- } else { //No extension?
- length = strlen(map_name);
- strcat(map_name, ".gat");
- }
- if (length > MAP_NAME_LENGTH - 4) {
- ShowError("(mapindex_init) Adjusted Map name %s is too long. Maps are limited to %d characters.\n", map_name, MAP_NAME_LENGTH);
- continue;
- }
-
- if (indexes[index].length)
- ShowWarning("(mapindex_init) Overriding index %d: map \"%s\" -> \"%s\"\n", indexes[index].name, map_name);
-
- strncpy(indexes[index].name, map_name, MAP_NAME_LENGTH);
- indexes[index].length = length;
- if (max_index <= index)
- max_index = index+1;
+ mapindex_addmap(index,map_name);
break;
default:
continue;
@@ -129,4 +132,3 @@ void mapindex_init(void) {
void mapindex_final(void) {
}
-
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-21 12:03:38 +0000