Commit Graph

210 Commits

Author SHA1 Message Date
Duncan Frost ce0321aba7 Cleaned up gfx notes 2014-06-15 10:22:39 +01:00
Duncan Frost 7128ca9f5d Fix small bug with adjust palette 2014-06-15 10:15:23 +01:00
Duncan Frost 61a30b16fb Tidied up gfx_string. Deleted control char enum. Now uses string_ids enum to prevent multiple defs. 2014-06-15 10:09:28 +01:00
Duncan Frost b0475b3f15 Labeled global vars, removed obselete comments and changed to local text_palette. 2014-06-14 09:46:04 +01:00
Duncan Frost 80b8ef29bd Fix merge fail 2014-06-14 09:05:33 +01:00
Duncan Frost 331159c9e6 Wrap string refactored to match other width functions. Error clean up. 2014-06-14 09:01:59 +01:00
Duncan cbd97facfd Added Char_control_code enum. Refactor of draw string 2014-06-14 08:34:58 +01:00
Duncan 0afec9c3e8 Cleaned up clip_string and string_width
Both functions are very similar. They now have the same bugs fixed.
2014-06-14 08:33:42 +01:00
Duncan db2f855579 Small bug fix in char width. Switched to C99 inits
4th character type has to have the width increased from the g1 elements width rather than decreased.
2014-06-14 08:32:47 +01:00
Duncan Frost 960307e3bc Fixed bug in create window due to uninitialised data. Finished load_character_width function 2014-06-14 08:32:47 +01:00
Duncan Frost ba1c414165 Started decompiling character width loading function 2014-06-14 08:32:46 +01:00
Duncan 2e0f34222c Added Char_control_code enum. Refactor of draw string 2014-06-13 15:02:34 +01:00
Duncan a73ed7ce94 Cleaned up clip_string and string_width
Both functions are very similar. They now have the same bugs fixed.
2014-06-13 12:57:05 +01:00
Duncan 04facd2fcd Small bug fix in char width. Switched to C99 inits
4th character type has to have the width increased from the g1 elements width rather than decreased.
2014-06-13 12:49:35 +01:00
IntelOrca 521dadfd7b Merge branch 'gfx_strings' of https://github.com/ZedThree/OpenRCT2 into ZedThree-gfx_strings 2014-06-13 01:26:34 +01:00
Duncan Frost 583d769ad1 Fixed bug in create window due to uninitialised data. Finished load_character_width function 2014-06-13 00:02:52 +01:00
Duncan Frost 0e3702f463 Started decompiling character width loading function 2014-06-12 21:49:59 +01:00
ZedThree 08b69b6361 Bug fix: off-by-one 2014-06-12 21:19:13 +02:00
Duncan Frost 6f65ba5714 Fix a few bugs to do with the buffer being incremented at start of loop 2014-06-11 19:08:00 +01:00
ZedThree 121990d68f Replace unneeded addresses with variables 2014-06-11 19:50:31 +02:00
ZedThree d2c80229c1 Fixes #171 2014-06-11 19:50:30 +02:00
ZedThree 74f5fbc31a Bug fix for strings with non-char sprites 2014-06-11 19:50:30 +02:00
ZedThree 0f0351d341 Byte width bug fixes 2014-06-11 19:50:29 +02:00
ZedThree fcc5e29b76 Add comments, removed unused vars 2014-06-11 19:47:49 +02:00
ZedThree 89b199a6c8 Tidy up 2014-06-11 19:47:48 +02:00
ZedThree 46965b0575 Finish wrap_string 2014-06-11 19:44:31 +02:00
ZedThree 1e23390406 First pass of gfx_wrap_string 2014-06-11 19:44:31 +02:00
IntelOrca f83ca084cf Merge branch 'gfx_unstable' 2014-06-10 23:08:07 +01:00
Duncan Frost 842cbe5b58 Fix bug #114 2014-06-10 22:47:47 +01:00
Duncan Frost b073c8eaef Finished last part of zooming code. Appears to work good. 2014-06-10 22:20:44 +01:00
Duncan Frost 2b9d7af156 Messing with zooming code currently breaks. 2014-06-09 23:10:54 +01:00
Duncan Frost 490fe70db8 Trying different zoom technique 2014-06-07 21:34:24 +01:00
Duncan Frost 9f01c5d6bf Fixed small positioning bug in draw_string due to incorrect signness. 2014-06-06 10:18:39 +01:00
Duncan Frost c158d98e5c Fixed graphical text glitch. Due to not copying whole dword 2014-06-06 09:54:30 +01:00
Duncan f6a3c2dd04 Fix small palette issue. 2014-06-05 16:49:30 +01:00
Duncan Frost c333e9f042 Fix small dereference mistake 2014-06-04 19:47:46 +01:00
Duncan 55e8fe74ff more small changes 2014-06-04 17:04:33 +01:00
Duncan 8b233c2f79 More gfx_draw_string notes. 2014-06-04 12:30:53 +01:00
Duncan 49432dd96f Added a few notes to draw_string. 2014-06-03 12:57:58 +01:00
Duncan 1629b3fce7 Fixed possible small palette bug.
Added notes on what is happening in draw_string.
2014-06-02 16:55:02 +01:00
Duncan Frost f1c8981e79 Switched to draw_sprite in draw_string function. Added freeing of zoomed image 2014-06-01 09:25:53 +01:00
Duncan Frost 6bd6971cb2 Merged in gfx_unstable 2014-05-31 20:56:57 +01:00
ZedThree 8b1c76b1b6 Replace pad_0E with zoom_level 2014-05-31 16:43:39 +02:00
ZedThree a06f6ade8b String functions for wrapped text 2014-05-31 16:40:44 +02:00
ZedThree 583fbaa2a4 Fix some pointer issues 2014-05-31 16:40:43 +02:00
ZedThree 5b41528e2e Rename variables in get_width to align with clip_string 2014-05-31 16:40:43 +02:00
ZedThree 1dc794b038 Finish clip string 2014-05-31 16:40:43 +02:00
ZedThree 9c9ece2d7b clip text mostly working 2014-05-31 16:40:42 +02:00
ZedThree 9fecf42e51 Tidy up loop on pointer 2014-05-31 16:40:42 +02:00
ZedThree b5d11159b3 Start of clip_text 2014-05-31 16:40:41 +02:00
ZedThree 130796052f More string functions 2014-05-31 16:40:41 +02:00
ZedThree 4fdba86b01 Add address for common string format buffer 2014-05-31 16:40:40 +02:00
ZedThree 55183d0589 draw_string_centred 2014-05-31 16:40:40 +02:00
ZedThree 504ce150ea Fix bug in gfx_get_string_width 2014-05-31 16:40:40 +02:00
ZedThree 67b7ca8d1e Fix use of g1_elements and tidy comments 2014-05-31 16:40:39 +02:00
ZedThree c3ea45062b gfx_draw_string complete. Needs tidying 2014-05-31 16:40:39 +02:00
ZedThree 702a97b185 Fix some bugs, tidy up
Still buggy...
2014-05-31 16:40:38 +02:00
ZedThree 99c7b23452 Second pass of gfx_draw_string. Still buggy 2014-05-31 16:40:38 +02:00
ZedThree 6e778006a5 First pass for gfx_draw_string() 2014-05-31 16:40:37 +02:00
ZedThree 34a9f94ac1 Add gfx_get_string_width() 2014-05-31 16:40:37 +02:00
Duncan Frost ed31f96c33 Added sprite zoom function. No freeing yet leaks memory like a sive 2014-05-30 17:28:06 +01:00
Duncan 81fe1d3494 Added more draw_string reaches first draw_sprite_call 2014-05-30 15:33:10 +01:00
Duncan e69b354055 Added a small bit more to draw_string 2014-05-30 12:42:39 +01:00
Duncan Frost 33833b413f Added more gfx_draw_string 2014-05-29 17:55:52 +01:00
Duncan Frost c006e27700 Started adding draw_string 2014-05-28 21:15:19 +01:00
Duncan Frost 0715a5122e Added unknown pointer as variable. Will be named when function determined 2014-05-28 20:52:32 +01:00
Duncan Frost 9779128fba Added peep_palette rewrote top and trouser code 2014-05-28 18:00:28 +01:00
Duncan Frost 07e5b58982 Merge to gfx_unstable 2014-05-27 22:37:16 +01:00
IntelOrca 74f5db4ebd Merge branch 'master' into gfx_unstable 2014-05-27 22:28:45 +01:00
Duncan Frost ba9d33de10 Merge 2014-05-27 22:22:57 +01:00
Duncan Frost a3b33c4656 Split draw_string in two for draw_sprite and others to jump in. Started decoding top and trousers code. 2014-05-27 22:20:00 +01:00
IntelOrca 20a18a8ba3 fix awards window and remove original call 2014-05-27 21:02:20 +01:00
Duncan 1aa7e33aae Added notes about splitting gfx_draw_sprite 2014-05-27 16:35:11 +01:00
Duncan Frost b8887876ea Cleaned up more asm code 2014-05-26 22:28:26 +01:00
Duncan Frost 2a77380bcb Messing about 2014-05-25 11:41:57 +01:00
anyc 30fe4361eb fixed RCT2_ERROR with GCC; added missing include 2014-05-25 11:47:22 +02:00
Duncan Frost 775ce9e83d Added comments to code 2014-05-25 09:42:29 +01:00
Duncan Frost af33568f01 Cleaned up functions brought two identical ones together 2014-05-25 09:30:54 +01:00
anyc 277f0ff4a5 GCC fixes 2014-05-24 21:24:25 +02:00
Duncan Frost fdca2fb275 Even more c clean up 2014-05-24 20:18:48 +01:00
IntelOrca 36144b85be clean up loading of g1.dat 2014-05-24 18:41:38 +01:00
Duncan Frost 08dcee5d92 Translated more into C 2014-05-24 18:35:33 +01:00
Duncan Frost b3ced1eedc more C cleanup 2014-05-24 14:41:33 +01:00
Duncan Frost 20d136bacf Started to turn the buffer code into legable C 2014-05-24 10:53:34 +01:00
Duncan Frost 0b20f94182 Added more readable variable names 2014-05-23 13:57:47 +01:00
Duncan Frost 296e014ac0 Added palette pointer 2014-05-23 13:03:26 +01:00
Duncan Frost 503826e762 Cleaned up comments added enums to make code easier to read 2014-05-23 12:08:20 +01:00
Duncan Frost d5586aabfe Merge to gfx_unstable 2014-05-23 11:01:19 +01:00
Duncan Frost cd3db82343 Added notes for what has been tested. 2014-05-23 10:54:31 +01:00
Duncan Frost 9f3bdff3c9 Added alternitive image_types to 2nd buffer function 2014-05-23 10:22:31 +01:00
Duncan Frost b144147400 Added last parts to main buffer function 2014-05-23 09:45:18 +01:00
Duncan Frost 8bc3ac03c4 Added more buffer of the buffer function 2014-05-23 09:05:21 +01:00
Duncan Frost 5a5a5409a2 Started implementing next set of buffer functions. Cleaned up some comments and code paths 2014-05-22 19:18:50 +01:00
Duncan Frost 5c927eb418 Fixed small graphical glitch caused by too small a variable 2014-05-22 17:51:15 +01:00
Duncan Frost e5a9426203 Added final part of main code section. 2014-05-21 18:57:56 +01:00
Duncan Frost e11e9d78f9 Fixed small bug due to wrong constant. 2014-05-21 18:21:49 +01:00
Duncan Frost 0a8a56d4b0 Bug in buffer code changing the colour of peep 2014-05-20 18:32:42 +01:00
anyc e6c90c6ebb fixed static enums; added missing headers 2014-05-20 17:55:39 +02:00
anyc 82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
Duncan Frost 9270aa6aae Fixed tab background bug. 2014-05-19 22:06:01 +01:00