Mercurial > hg > early-roguelike
comparison arogue7/util.c @ 239:837044d2c362
Merge the GCC5 and build fix branches.
This fixes all warnings produced by GCC 5, except the ones related to
system functions. Those could be fixed by including the proper headers,
but it would be better to replace the system-dependent code with
functions from mdport.c.
author | John "Elwin" Edwards |
---|---|
date | Fri, 11 Mar 2016 19:47:52 -0500 |
parents | e1cd27c5464f |
children | d71e5e1f49cf |
comparison
equal
deleted
inserted
replaced
232:bac2c81fec78 | 239:837044d2c362 |
---|---|
207 { | 207 { |
208 msg("Wait, what's going on here. Huh? What? Who?"); | 208 msg("Wait, what's going on here. Huh? What? Who?"); |
209 if (find_slot(unconfuse)) | 209 if (find_slot(unconfuse)) |
210 lengthen(unconfuse, HUHDURATION); | 210 lengthen(unconfuse, HUHDURATION); |
211 else | 211 else |
212 fuse(unconfuse, 0, HUHDURATION, AFTER); | 212 fuse(unconfuse, NULL, HUHDURATION, AFTER); |
213 turn_on(player, ISHUH); | 213 turn_on(player, ISHUH); |
214 } | 214 } |
215 else msg("You feel dizzy for a moment, but it quickly passes."); | 215 else msg("You feel dizzy for a moment, but it quickly passes."); |
216 } | 216 } |
217 | 217 |