… | |
… | |
74 | |
74 | |
75 | const shstr &operator =(const char *str) |
75 | const shstr &operator =(const char *str) |
76 | { |
76 | { |
77 | --refcnt (); |
77 | --refcnt (); |
78 | |
78 | |
79 | #if 0 |
|
|
80 | // this optimises the important case of str == constant 0 |
79 | // this optimises the important case of str == constant 0 |
81 | if (is_constant (str)) |
80 | if (is_constant (str)) |
82 | s = str ? intern (str) : null; |
81 | s = str ? intern (str) : null; |
83 | else |
82 | else |
84 | #endif |
|
|
85 | s = intern (str); |
83 | s = intern (str); |
86 | |
84 | |
87 | return *this; |
85 | return *this; |
|
|
86 | } |
|
|
87 | |
|
|
88 | bool operator ==(const shstr &b) |
|
|
89 | { |
|
|
90 | return s == b.s; |
|
|
91 | } |
|
|
92 | |
|
|
93 | bool operator !=(const shstr &b) |
|
|
94 | { |
|
|
95 | return !(*this == b); |
88 | } |
96 | } |
89 | }; |
97 | }; |
90 | |
98 | |
91 | inline int strlen (const shstr &sh) |
99 | inline int strlen (const shstr &sh) |
92 | { |
100 | { |
93 | return sh.length (); |
101 | return sh.length (); |
94 | } |
102 | } |
95 | |
103 | |
|
|
104 | // only good for mass comparisons to shstr objects |
|
|
105 | struct shstr_cmp |
|
|
106 | { |
|
|
107 | const char *s; |
|
|
108 | |
|
|
109 | explicit shstr_cmp (const char *s) |
|
|
110 | : s (shstr::find (s)) |
|
|
111 | { |
|
|
112 | } |
|
|
113 | |
|
|
114 | operator const char *() const { return s; } |
|
|
115 | }; |
|
|
116 | |
96 | inline bool operator ==(const shstr &a, const shstr &b) |
117 | inline bool operator ==(const shstr_cmp &a, const shstr &b) |
97 | { |
118 | { |
98 | return a.s == b.s; |
119 | return a.s == b.s; |
99 | } |
120 | } |
100 | |
121 | |
101 | inline bool operator !=(const shstr &a, const shstr &b) |
122 | inline bool operator ==(const shstr &a, const shstr_cmp &b) |
102 | { |
123 | { |
103 | return !(a == b); |
124 | return b == a; |
104 | } |
125 | } |
|
|
126 | |
|
|
127 | extern const shstr undead_name; /* Used in hit_player() in main.c */ |
105 | |
128 | |
106 | #endif |
129 | #endif |
107 | |
130 | |