| … | |
… | |
| 43 | * if it can't find a matching name /or/ a fallback region it logs an info message |
43 | * if it can't find a matching name /or/ a fallback region it logs an info message |
| 44 | * message and returns NULL |
44 | * message and returns NULL |
| 45 | * used by the map parsing code. |
45 | * used by the map parsing code. |
| 46 | */ |
46 | */ |
| 47 | region * |
47 | region * |
| 48 | region::find (const char *name) |
48 | region::find (shstr_cmp name) |
| 49 | { |
49 | { |
| 50 | for_all_regions (rgn) |
50 | for_all_regions (rgn) |
| 51 | if (!strcmp (rgn->name, name)) |
51 | if (rgn->name == name) |
| 52 | return rgn; |
52 | return rgn; |
| 53 | |
53 | |
| 54 | LOG (llevError, "region called %s requested, but not found, using fallback.\n", name); |
54 | LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name); |
| 55 | |
55 | |
| 56 | return default_region (); |
56 | return default_region (); |
| 57 | } |
57 | } |
| 58 | |
58 | |
| 59 | /* |
59 | /* |
| … | |
… | |
| 72 | region::find_fuzzy (const char *name) |
72 | region::find_fuzzy (const char *name) |
| 73 | { |
73 | { |
| 74 | if (!name) |
74 | if (!name) |
| 75 | return default_region (); |
75 | return default_region (); |
| 76 | |
76 | |
|
|
77 | // TODO: bug, changes possibly const string |
| 77 | char *p = strchr (name, '\n'); |
78 | char *p = strchr (name, '\n'); |
| 78 | if (p) |
79 | if (p) |
| 79 | *p = '\0'; |
80 | *p = '\0'; |
| 80 | |
81 | |
| 81 | for_all_regions (rgn) |
82 | for_all_regions (rgn) |
| 82 | if (!strcasecmp (rgn->name, name)) |
83 | if (rgn->name.eq_nc (name)) |
| 83 | return rgn; |
|
|
| 84 | |
|
|
| 85 | for_all_regions (rgn) |
|
|
| 86 | if (rgn->longname) |
|
|
| 87 | if (!strcasecmp (rgn->longname, name)) |
|
|
| 88 | return rgn; |
84 | return rgn; |
| 89 | |
85 | |
| 90 | for_all_regions (rgn) |
86 | for_all_regions (rgn) |
| 91 | if (rgn->longname) |
87 | if (rgn->longname.eq_nc (name)) |
| 92 | { |
|
|
| 93 | if (strstr (rgn->longname, name)) |
|
|
| 94 | return rgn; |
88 | return rgn; |
| 95 | } |
|
|
| 96 | |
89 | |
| 97 | for_all_regions (rgn) |
90 | for_all_regions (rgn) |
| 98 | if (rgn->longname) |
91 | if (rgn->longname.contains (name)) |
| 99 | { |
92 | return rgn; |
|
|
93 | |
|
|
94 | for_all_regions (rgn) |
| 100 | /* |
95 | /* |
| 101 | * This is not a bug, we want the region that is most identifiably a discrete |
96 | * This is not a bug, we want the region that is most identifiably a discrete |
| 102 | * area in the game, eg if we have 'scor', we want to return 'scorn' and not |
97 | * area in the game, eg if we have 'scor', we want to return 'scorn' and not |
| 103 | * 'scornarena', regardless of their order on the list so we only look at those |
98 | * 'scornarena', regardless of their order on the list so we only look at those |
| 104 | * regions with a longname set. |
99 | * regions with a longname set. |
| 105 | */ |
100 | */ |
| 106 | if (strstr (rgn->name, name)) |
101 | if (rgn->longname && rgn->name.contains (name)) |
| 107 | return rgn; |
|
|
| 108 | } |
|
|
| 109 | |
|
|
| 110 | for_all_regions (rgn) |
|
|
| 111 | { |
|
|
| 112 | if (strstr (rgn->name, name)) |
|
|
| 113 | return rgn; |
102 | return rgn; |
| 114 | } |
103 | |
|
|
104 | for_all_regions (rgn) |
|
|
105 | if (rgn->name.contains (name)) |
|
|
106 | return rgn; |
| 115 | |
107 | |
| 116 | return default_region (); |
108 | return default_region (); |
| 117 | } |
109 | } |
| 118 | |
110 | |
| 119 | void |
111 | void |
