common/button.c: Fix mood floor code - before, it was changing the moods
of all sorts of objects (luggage, itself, etc). Now, it only
changes objects above the floor, and only monsters.
MSW 2002-05-31
16 lines of code changed in 2 files:
Fix last checkin - new code didn't really do anything, as was missing
the else clause.
MSW 2002-05-30
3 lines of code changed in 1 file:
Add sign to Euthville town square.
MSW 2002-05-30
10 lines of code changed in 1 file:
config.c: when user is switching download all images, have it update
the use_config field immediately.
image.c: if image 0 is passed to get_map_image_size, just set the
values to 1.
MSW 2002-05-30
5 lines of code changed in 2 files:
Fix some exits in santo_dominion which didn't lead back to the map
properly.
Add euthville (kar) maps.
MSW 2002-05-30
83649 lines of code changed in 23 files:
Main change is the addition of name_pl and client_type to object
structure. The name_pl contains the proper plural name instance - fixes
problem of '2 tooths'. client_type is sent to the client so that client
doesn't need to figure out sorting on its own. Client_type is an object
attribute, so can be modified in maps to hide the real type.
--
common/arch.c: item_matched_string() modified to use the name_pl field
when trying to match names, and not to try to make the name plural
itself.
common/item.c: query_short_name(),query_base_name() modified to
use name_pl instead of trying to make the name plural.
common/loader.c, common/loader.l: Add code to load and save the name_pl
value and client_type. Add logic when object is finished loading
to set name_pl value to same as name or arch name if no name_pl
is specified - this supports old maps/characters in which the objects
dont have a name_pl field yet. Disable logic for need_an and need_ie
flags since they are no longer needed. Fix bug that caused
elevation not to get saved.
common/object.c: Add client_type check for CAN_MERGE function. Add
appropriate logice in functions to handle setting, clearing, and
copying of name_pl values. Remove unused anim_... fields
initialization.
doc/Developers/objects: Add information about the name_pl field and
client_type.
doc/Developers/protocol: Remove item protocol command info - it has
been obsoleted. Add information about item2 protocol command.
include/define.h: Remote ST1_* values - they were not being used.
comment out FLAG_AN and FLAG_NEED_IE values.
include/newserver.h: Add itemcmd to socket structure - this is the
version of the item protocol command that will be sent to the client.
include/object.h: Add name_pl and client_type field to object structure.
Remove unused anim_* values.
lib/archetypes: rebuilt with new archetypes that contain client_type
and name_pl information.
lib/bmaps, lib/bmaps.paths, lib/crossfire.1, lib/crossfire.0, lib/faces:
rebuilt.
server/monster.c: Remove anim_ references that were not being used.
socket/init.c: Initialize itemcmd version in the socket to 1.
socket/item.c: Remove special handling for clients of old versions - all
clients now have to be at least sc_version 1024 (which has been around for
a long time). This simplifies a lot of the object code that deals with
sending or not sending plural names to the client - now always send them.
Change code that sends item to client to use the item revision (currently
1 or 2) that the client wants. If version 2, send along client_type
information.
socket/request.c: Handle 'itemcmd' parameter in setup command. Make
sure it is in proper range. If client is very old (sc_version < 1024)
tell them so.
MSW 2002-05-30
499 lines of code changed in 14 files:
add name_pl, client_type information to objects that can get picked up.
Remove some duplicates, change poisonfood to use the same face as booze
so you can't tell simply by looking at it that it is bad food.
Change some of the names for the skill scrolls to put them more in line
with the skills they actually give you.
MSW 2002-05-30
861 lines of code changed in 393 files:
Add support for the 'item2' command. This lets us get the item type
from the server so that we don't need to figure it out for ourselves.
Also, remove support for the 'item' command - that has long since
been obseleted by the 'item1' command.
--
common/client.c: Remove 'item' from dispatch table, add 'item2'.
Add 'itemcmd 2' as part of setup command we send to server.
common/commands.c: Add handling for response of 'itemcmd' setup command from
server. Remove ItemCmd() function. Add type to calls to update_item().
Change Item1Cmd() function to be called common_item_command() since both
item1 and item2 use almost exactly the same logic. Add Item1Cmd() and
Item2Cmd() which just call common_item_command()
common/item.c: Init item types to 'NO_ITEM_TYPE'. Remove get_nrof() as it was
no longer being used. Add type argument to set_item_values() and
update_item(). Simplify code in case of name handling, since we know that
we will be using at least the 'itemcmd'. Don't worry about getting proper
nrof for the player object - its nrof isn't really meaningful anyways.
common/item.h: Add #define NO_ITEM_TYPE. Update type field in item
to be 16 bits.
common/proto.h: rebuilt.
MSW 2002-05-30
99 lines of code changed in 6 files:
Anyone with inscriptions skill could make anything:
use_skill inscription endmsg
use_skill inscription Object CSword
...
use_skill inscription end
use_skill inscription msg
4 lines of code changed in 1 file:
Properly add mailed_fist entries to the maps-bigworld. Previously,
they weren't properly re-parented and corrupted the main entries.
MSW 2002-05-28
362 lines of code changed in 3 files:
Some maps that didn't make it in the last commit.
Add pupland to maps-bigworld. Maps are basically unchanged.
MSW 2002-05-21
2237 lines of code changed in 28 files:
Add pup_land maps to maps-bigworld. Other than the return exits being
updated and locating the guilds within pupland within this directory,
no changes to the maps.
MSW 2002-05-21
29251 lines of code changed in 354 files:
README: Add notes to describe process of moving unique maps to
maps-bigworld system.
update_exits.pl: Modified to include any number of source and
destination values, so the script can be used to update any number
of exits at once.
MSW 2002-05-21
92 lines of code changed in 2 files:
The bulk of this checkin adds support in the client for the map1a protocol
command and the display of big images properly in the map window. A lot
of code cleanup was also done however, including removal for the support
of the 'map' (original) command. The map1 has been in the server code for
quite a while.
TODO: Update what needs to be done for the x11 client.
common/client.c: Remove map command, add map1a command to dispatch table.
Modify setup we send to server to always try to use the map1a command -
there is no reason not to use it.
common/client.h: Change some of the CONFIG_ values - basically, change it
so that there is just one entry for lighting configuration, but it can
have any number of values. Modify MapCell so that instead of having
multiple arrays for the different values (faces, sizes), add a MapCellLayer
structure that contains the specific face information for that layer.
Move the PlayerPosition struct and value to this function so that more
of the map decompress logic can be handled in the common code.
Remove count value from MapCell since it wasn't really being used.
common/commands.c: Add code to set the use_config[CONFIG_CACHE] value based on
what we get back from the server. Add code to check the setup response for
the for the map1a and map1 options. Add code to deal with expanding big
images into appropriate spaces. Move some functions from the gui portion to
(display_map_clearcell, set_map_face). Add code for map1_common function to
deal with map1a extensions.
common/external.h: Remove display_map_clearcell and set_map_face from list of
external functions. Add get_map_image_size function.
common/init.c: change some values of the config values. Update initialization
of config values for lighting.
common/proto.h: rebuilt.
gtk/config.c: Add new button for lighting - best per pixel. Modify code
to properly deal with how lighting preference is now stored. Add legacy
support for loading of per_tile_lighting and per_pixel_lighting values
from config file. Add diagnostic of bad value if selected map/width
is out of range.
gtk/gtkproto.h: rebuilt.
gtk/gx11.c: Change formatting of draw_list. Modify it so that it adjusts
the column/row width based on the largest image it needs to display - In
this way, if a player stands on a big building, the entire building is
displayed in the look list. add row_height and column_width values so we
only need to call the function to change them if they are in fact different.
Add +sdl command line option to disable sdl code. Modify gtk_draw_map to
include redraw parameter.
gtk/gx11.h: remove PlayerPosition structure. add row_height, column_width
elements to itemlist structure.
gtk/image.c: Add table that is used to determine the scaling used for big
images in the look list - in this way, big images still appear big, but not
necessary 2 or 3 times bigger. Modify create_and_rescale_image_from_data to
use this logic. Add get_map_image_size which the common code uses to
determine the number of spaces an image may be.
gtk/map.c: remove display_map_clearcell and set_map_face functions - now in
common code. Modify the dump map/darkness routines to use the new format of
the MapCell structure. Modify set_darkness to only set adjoining spaces for
needing an update if lighting type is set that needs this. Remove
display_map_addbelow - only used for 'map' command. Modify logic of
fog of war code to have it done all at display time - not when setting/clearing
a cells contents. Modify gtk_draw_map - this basically follows the same
logic of sdl_draw_map - it is now better optimized to only draw the spaces
that have changed, and not the entire map - this should improve performance
considerably.
gtk/sdl.c: Remove #if 0 around putpixel - used for best lighting. Change
indention of init_SDL - modify it so that if just_lightmap is true,
that really is the only thing that is changed. Modify per_pixel_light
code to use both methods of per pixel lighting depending on player prefernce.
Modify sdl_gen_map to properly handle draw portion of big images.
x11/png.c: Add get_map_image_size function.
x11/x11.c: modify display_mapcell_pixmap to use new format of MapCell
structure. Remove reference to count in MapCell structure.
x11/x11.h: Remove PlayerPosition information - now in common code.
x11/x11proto.h: rebuilt.
x11/xutil.c: Remove display_map_clearcell and set_map_face functions. Modify dump map
code for new MapCell structure layout. Remove display_map_addbelow funtion.
MSW 2002-05-21
1220 lines of code changed in 20 files:
Add some files that didn't get in the last commit for addition
of Santo Dominion. MSW 2002-05-19
5081 lines of code changed in 48 files:
Update scorn maps with changes that have been made in the main map
distribution.
Add santo_dominion maps, as well as road connecting scorn and
santo dominion.
MSW 2002-05-19
40074 lines of code changed in 33 files:
crossedit/png.c, crossedit/xutil.c: Increase size of temporary buffers that
are used when loading images - necessary to allow the editor to run without
crashing.
include/newserver.h: Remove quick_pos from the MapCell structure.
server/main.c: Add code to set the coordinates to the EMERGENCY_X/Y
values if using the EMERGENCY_MAP.
socket/request.c: Fix code that was causing darkness to get repeatedly
sent for some spaces.
MSW 2002-05-19
26 lines of code changed in 6 files:
Fix for last commit - the old map command caused the server to crash
because it apparantly packed in more layers. Increase MAP_LAYERS
by one in map.h, and just return on the buffer being full, don't
abort.
MSW 2002-05-18
2 lines of code changed in 2 files:
The bulk of this commit is to modify the server to only send the lower
rightmost part of multipart archetypes that use the same head. This allows
support of big images in the client.
common/arch.c: Modify first_arch_pass to figure out the tail_x/y values for
multipart archs. Rename the prev variable to head, as that it really what
it is. Remove quick_pos info.
common/object.c: remove quick_pos info from object.
doc/Developers/images: Add notes about using merged images.
doc/Developers/protocol: Add information about the map1a command, which
is used to for big image support. Remove map2 documentation.
include/map.h: Add MAP_LAYERS define instead of using hardcoded value of 3.
include/newserver.h: Change the MapCell to use MAP_LAYERS - saves
considerable memory. Add defines for MAX_CLIENT_ map sizes.
Remove map1cmd, map2cmd elements from socket structure - instead use enumeration
of mapmode - only one map type will be used at any time by the client, so
no reason to have individual elements - it also makes it easier to add new
mapmode commands.
include/object.h: remove quick_pos, update_tag from object structure.
Add tail_x, tail_y values to archetype structure.
include/player.h: Remove some now unused values from the player structure
(drawn, floor, floor2, darkmask). These have been superseded by the
map cells in the socket structure for quite a while.
include/sockproto.h: rebuilt
server/player.c: Remove code that initialized the drawn values in the player
structure since they no longer exist.
socket/init.c: Replace map1cmd, map2cmd elements in socket structure with
mapmode element. Modify init_ericserver so that it properly passes an
int when setting the SO_REUSERADDR field.
socket/request.c: Modify code in SetUp function to use the new mapmode
enumeration in the socket structure. Add support for map1acmd setup
option. Throughout map code, replace MAXMAPCELLFACES with MAP_LAYERS.
modify map_clearcell to take options for values to clear the cell to.
Add have_head, check_head, and update_space commands - used with the
map1 command to store and find head information.
draw_client_map1 modified to support map1a extensions, as well as added
logic for checking for heads in blocked and out of viewable map spaces.
Some of the code is simplified by using the update_space function, since
the logic for processing each layer was otherwise the same. remove
draw_client_map2 function. esrv_map_scroll has same logic - some
variables and code formatting changes.
MSW 2002-05-18
595 lines of code changed in 13 files:
Patch to prevent players with no experience from saving. This apparantly
should prevent some abuses. MSW 2002-05-18
4 lines of code changed in 2 files:
Fix animation in sorigs armor.
Add merged images for some objects I used in testing - the archetypes
need to be modified to use these, but a new version of the clients needs
to get pushed out before that can happen. Committing them will save
someone the work of merging them later on.
MSW 2002-05-18
7 lines of code changed in 7 files:
server/attack.c: Don't generate PLAYER_KILL_PLAYER messages if kill
happened on battleground. Also, datestamp the messages.
MSW 2002-05-13
15 lines of code changed in 2 files:
Removed the hard coded crosssfire-image from the system-wide default image cache
location. This will allow people to --datadir define where they want the files.
2 lines of code changed in 1 file:
server/attack.c: Generate log message when a player kills another player -
include the ip address of the killer to make it easier to add them to
ban files. MSW 2002-05-06
12 lines of code changed in 2 files:
Adjusted width/height limits to better allow WM decorations.
2 lines of code changed in 1 file:
Fixed the Occidental Mages scripted items. Those were broken since the switch from Guile to Python
4 lines of code changed in 1 file: