Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/coelckers/gzdoom into vul…

…kan2
  • Loading branch information...
madame-rachelle committed Mar 12, 2019
2 parents 916f219 + fd4295b commit 879aae1bd37156f13a788e845496182ad047b3c4
Showing with 57,672 additions and 346 deletions.
  1. +1 −0 src/CMakeLists.txt
  2. +1 −1 src/c_cmds.cpp
  3. +190 −188 src/c_console.cpp
  4. +4 −4 src/c_console.h
  5. +3 −3 src/c_dispatch.cpp
  6. +6 −5 src/ct_chat.cpp
  7. +1 −1 src/d_net.cpp
  8. +3 −3 src/fragglescript/t_func.cpp
  9. +2 −7 src/g_game.cpp
  10. +2 −2 src/g_level.cpp
  11. +9 −8 src/g_statusbar/hudmessages.cpp
  12. +2 −1 src/g_statusbar/sbar.h
  13. +1 −0 src/g_statusbar/sbarinfo.cpp
  14. +1 −0 src/g_statusbar/shared_sbar.cpp
  15. +1 −1 src/gamedata/a_keys.cpp
  16. +238 −0 src/gamedata/fonts/hexfont.cpp
  17. +11 −2 src/gamedata/fonts/v_font.cpp
  18. +1 −1 src/gamedata/fonts/v_font.h
  19. +1 −0 src/gamedata/fonts/v_text.cpp
  20. +0 −2 src/gamedata/fonts/v_text.h
  21. +4 −47 src/menu/loadsavemenu.cpp
  22. +1 −1 src/menu/menu.h
  23. +7 −16 src/p_acs.cpp
  24. +2 −2 src/p_actionfunctions.cpp
  25. +2 −2 src/p_spec.cpp
  26. +22 −0 src/rendering/2d/v_draw.cpp
  27. +29 −6 src/rendering/2d/v_drawtext.cpp
  28. +4 −2 src/utility/cmdlib.cpp
  29. +2 −2 src/utility/stats.cpp
  30. +4 −0 src/utility/utf8.h
  31. +4 −4 src/utility/zstring.cpp
  32. +2 −1 src/v_video.cpp
  33. +7 −4 src/v_video.h
  34. +1 −0 src/win32/i_system.cpp
  35. +20 −0 wadsrc/static/credits/newconsolefont.txt
  36. +57,020 −0 wadsrc/static/newconsolefont.hex
  37. +1 −1 wadsrc/static/zscript/actors/inventory/inv_misc.zs
  38. +4 −4 wadsrc/static/zscript/actors/strife/alienspectres.zs
  39. +3 −3 wadsrc/static/zscript/actors/strife/strifeitems.zs
  40. +1 −1 wadsrc/static/zscript/actors/strife/thingstoblowup.zs
  41. +1 −0 wadsrc/static/zscript/base.zs
  42. +48 −17 wadsrc/static/zscript/ui/menu/loadsavemenu.zs
  43. +4 −3 wadsrc/static/zscript/ui/statscreen/statscreen_sp.zs
  44. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00A1.lmp
  45. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00AB.lmp
  46. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00BB.lmp
  47. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00BF.lmp
  48. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C0.lmp
  49. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C1.lmp
  50. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C2.lmp
  51. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C3.lmp
  52. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C4.lmp
  53. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C5.lmp
  54. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C7.lmp
  55. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C8.lmp
  56. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00C9.lmp
  57. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00CA.lmp
  58. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00CB.lmp
  59. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00CC.lmp
  60. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00CD.lmp
  61. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00CE.lmp
  62. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00CF.lmp
  63. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00D1.lmp
  64. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00D3.lmp
  65. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00D4.lmp
  66. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00D5.lmp
  67. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00D6.lmp
  68. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00D9.lmp
  69. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00DA.lmp
  70. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00DB.lmp
  71. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/00DC.lmp
  72. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0150.lmp
  73. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0152.lmp
  74. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0170.lmp
  75. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0178.lmp
  76. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0401.lmp
  77. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0402.lmp
  78. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0408.lmp
  79. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0409.lmp
  80. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/040A.lmp
  81. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/040B.lmp
  82. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/040D.lmp
  83. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/040F.lmp
  84. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0410.lmp
  85. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0411.lmp
  86. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0412.lmp
  87. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0413.lmp
  88. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0414.lmp
  89. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0415.lmp
  90. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0416.lmp
  91. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0417.lmp
  92. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0418.lmp
  93. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0419.lmp
  94. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/041A.lmp
  95. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/041B.lmp
  96. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/041C.lmp
  97. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/041D.lmp
  98. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/041E.lmp
  99. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/041F.lmp
  100. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0420.lmp
  101. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0421.lmp
  102. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0422.lmp
  103. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0423.lmp
  104. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0424.lmp
  105. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0425.lmp
  106. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0426.lmp
  107. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0427.lmp
  108. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0428.lmp
  109. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/0429.lmp
  110. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/042A.lmp
  111. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/042B.lmp
  112. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/042C.lmp
  113. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/042D.lmp
  114. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/042E.lmp
  115. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/042F.lmp
  116. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/1E9E.lmp
  117. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/2014.lmp
  118. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/201C.lmp
  119. BIN wadsrc_extra/static/filter/game-chex/fonts/defsmallfont/201E.lmp
  120. BIN wadsrc_extra/static/filter/game-doom/fonts/bigfont/{00DF.lmp → 1E9E.lmp}
  121. BIN wadsrc_extra/static/filter/game-doom/fonts/bigfont/201C.lmp
  122. BIN wadsrc_extra/static/filter/game-doom/fonts/bigfont/201D.lmp
  123. BIN wadsrc_extra/static/filter/game-doom/fonts/bigfont/201E.lmp
  124. BIN wadsrc_extra/static/filter/game-doom/fonts/bigupper/201C.lmp
  125. BIN wadsrc_extra/static/filter/game-doom/fonts/bigupper/201D.lmp
  126. BIN wadsrc_extra/static/filter/game-doom/fonts/bigupper/201E.lmp
  127. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/009F.lmp
  128. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00A1.lmp
  129. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00BF.lmp
  130. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C0.lmp
  131. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C1.lmp
  132. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C2.lmp
  133. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C3.lmp
  134. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C4.lmp
  135. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C5.lmp
  136. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C8.lmp
  137. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00C9.lmp
  138. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00CA.lmp
  139. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00CB.lmp
  140. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00CC.lmp
  141. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00CD.lmp
  142. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00CE.lmp
  143. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00D3.lmp
  144. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00D4.lmp
  145. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00D5.lmp
  146. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00D6.lmp
  147. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00D9.lmp
  148. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00DA.lmp
  149. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00DB.lmp
  150. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/00DC.lmp
  151. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0150.lmp
  152. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0170.lmp
  153. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0178.lmp
  154. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0401.lmp
  155. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0419.lmp
  156. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/{00DF.lmp → 1E9E.lmp}
  157. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/201C.lmp
  158. BIN wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/201E.lmp
  159. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/00C3.lmp
  160. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/00CC.lmp
  161. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/00D2.lmp
  162. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/00D5.lmp
  163. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/{00DF.lmp → 1E9E.lmp}
  164. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/201C.lmp
  165. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/201D.lmp
  166. BIN wadsrc_extra/static/filter/game-heretic/fonts/defbigfont/201E.lmp
  167. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/00C3.lmp
  168. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/00CC.lmp
  169. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/00D2.lmp
  170. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/00D5.lmp
  171. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/{00DF.lmp → 1E9E.lmp}
  172. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/201C.lmp
  173. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/201D.lmp
  174. BIN wadsrc_extra/static/filter/game-heretic/fonts/defsmallfont/201E.lmp
  175. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/00C3.lmp
  176. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/00CC.lmp
  177. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/00D2.lmp
  178. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/00D5.lmp
  179. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/{00DF.lmp → 1E9E.lmp}
  180. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/201C.lmp
  181. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/201D.lmp
  182. BIN wadsrc_extra/static/filter/game-hexen/fonts/defbigfont/201E.lmp
  183. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/00C3.lmp
  184. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/00CC.lmp
  185. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/00D2.lmp
  186. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/00D5.lmp
  187. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/{00DF.lmp → 1E9E.lmp}
  188. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/201C.lmp
  189. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/201D.lmp
  190. BIN wadsrc_extra/static/filter/game-hexen/fonts/defsmallfont/201E.lmp
  191. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/0021.lmp
  192. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00A1.lmp
  193. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00C0.lmp
  194. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00C1.lmp
  195. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00C2.lmp
  196. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00C4.lmp
  197. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00C7.lmp
  198. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00C8.lmp
  199. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00C9.lmp
  200. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00CA.lmp
  201. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00CB.lmp
  202. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00CC.lmp
  203. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00CD.lmp
  204. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00CE.lmp
  205. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00CF.lmp
  206. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00D1.lmp
  207. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00D2.lmp
  208. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00D3.lmp
  209. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00D4.lmp
  210. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00D6.lmp
  211. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00D9.lmp
  212. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00DA.lmp
  213. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00DB.lmp
  214. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00DC.lmp
  215. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/00DD.lmp
  216. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/0150.lmp
  217. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/0152.lmp
  218. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/0170.lmp
  219. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/0178.lmp
  220. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/0401.lmp
  221. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/0419.lmp
  222. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/1E9E.lmp
  223. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/201C.lmp
  224. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/201D.lmp
  225. BIN wadsrc_extra/static/filter/game-strife/fonts/bigfont/201E.lmp
  226. +1 −1 wadsrc_extra/static/filter/game-strife/fonts/bigfont/font.inf
  227. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00A1.lmp
  228. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00BF.lmp
  229. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp
  230. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp
  231. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp
  232. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp
  233. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C7.lmp
  234. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp
  235. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp
  236. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp
  237. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp
  238. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp
  239. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp
  240. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp
  241. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp
  242. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp
  243. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp
  244. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp
  245. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp
  246. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp
  247. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp
  248. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp
  249. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp
  250. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp
  251. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0152.lmp
  252. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp
  253. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp
  254. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/1E9E.lmp
  255. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/201C.lmp
  256. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/201D.lmp
  257. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/201E.lmp
  258. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00A1.lmp
  259. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00BF.lmp
  260. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00C0.lmp
  261. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00C1.lmp
  262. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00C2.lmp
  263. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00C4.lmp
  264. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00C7.lmp
  265. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00C8.lmp
  266. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00CA.lmp
  267. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00CB.lmp
  268. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00CC.lmp
  269. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00CE.lmp
  270. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00CF.lmp
  271. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00D2.lmp
  272. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00D4.lmp
  273. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00D6.lmp
  274. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00D9.lmp
  275. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00DB.lmp
  276. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00DC.lmp
  277. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/00DD.lmp
  278. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0150.lmp
  279. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0152.lmp
  280. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0170.lmp
  281. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0178.lmp
  282. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0401.lmp
  283. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0414.lmp
  284. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0419.lmp
  285. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0426.lmp
  286. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/0429.lmp
  287. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/1E9E.lmp
  288. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/201C.lmp
  289. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/201D.lmp
  290. BIN wadsrc_extra/static/filter/game-strife/fonts/defsmallfont2/201E.lmp
@@ -1146,6 +1146,7 @@ set (PCH_SOURCES
gamedata/fonts/singlepicfont.cpp
gamedata/fonts/specialfont.cpp
gamedata/fonts/font.cpp
gamedata/fonts/hexfont.cpp
gamedata/fonts/v_font.cpp
gamedata/fonts/v_text.cpp
gamedata/p_xlat.cpp
@@ -1199,7 +1199,7 @@ static void PrintSecretString(const char *string, bool thislevel)
else colstr = TEXTCOLOR_GREEN;
}
}
auto brok = V_BreakLines(ConFont, screen->GetWidth()*95/100, string);
auto brok = V_BreakLines(CurrentConsoleFont, screen->GetWidth()*95/100, string);

for (auto &line : brok)
{
Oops, something went wrong.

0 comments on commit 879aae1

Please sign in to comment.
You can’t perform that action at this time.