| Protocol: | pserver | User: | anonymous |
| Machine: | crossfire.cvs.sourceforge.net | CVSROOT: | /cvsroot/crossfire |
|
Filename: xutil.c | |||
| Revision 1.15 | ryo_saeba | 2006/03/18 09:05:31 | +2 -2 |
|
Massive cleaning of code. Shouldn't be any functional change. | |||
| Show difference between Revision 1.14 and 1.15 | |||
| Revision 1.14 | akirschbaum | 2006/03/16 14:59:51 | +1 -18 |
|
Apply patch #1439143 (code-cleanup: crossedit) by Stefan Huehner: Remove unused code, add static/const where appropriate. | |||
| Show difference between Revision 1.13 and 1.14 | |||
| Revision 1.13 | akirschbaum | 2005/10/24 15:48:15 | +2 -2 |
|
Code improvements: common/image.c: Declare some variables and functions as static or const; add safeguards while loading config files; remove support for numeric face names (no active archetype or map does use it); in free_all_images() deallocate memory allocated for smoothing. crossedit/xutil.c: Remove assignment to nrofpixmaps since ReadBmapNames() already sets this variable. include/{global.h, libproto.h, loader.h}: Remove now static variables and functions. | |||
| Show difference between Revision 1.12 and 1.13 | |||
| Revision 1.12 | mwedel | 2005/01/24 01:29:25 | +3 -6 |
|
common/object.c: Change CAN_MERGE() from an inline function, since it calls itself and inline functions are not supposed to do that. Update type check in insert_ob_in_map() to check against defined type (EXIT) instead of hardcoded integer value (66). crossedit/xutil.c: Update to just include Defines.h, which then includes all the other necessary files, including global.h. include/global.h: Add #ifdef checks for the UINT*_MAX types, as some systems already define these values, which results in a redefinition error. Also fix up // style comment. include/shstr.h: Include proper cast in TOPBIT definition. server/main.c: Don't display 'xyz left the game' messages if the player is only at the get name or get password prompt. Prevents possible spoofing of that message. server/player.c: Clean up formatting of check_pick() function. If player is using newpickup to pick up booze, also pick up poison unless they know it is cursed. socket/request.c: AskSmooth() - change buffer type to uint8 so that it matches what the SockList structure wants. utils/scores.pl.in: Use skill_praying to find players god, and not the deprecated experience_wis object. MSW 2005-01-23 | |||
| Show difference between Revision 1.11 and 1.12 | |||
| Revision 1.11 | mwedel | 2002/07/14 23:25:40 | +3 -3 |
|
Update banner copyright with proper contact information. MSW 2002-07-14 | |||
| Show difference between Revision 1.10 and 1.11 | |||
| Revision 1.10 | mwedel | 2002/05/19 22:11:49 | +5 -3 |
|
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 | |||
| Show difference between Revision 1.9 and 1.10 | |||
| Revision 1.9 | mwedel | 2002/04/24 01:31:48 | +2 -2 |
|
crossedit/xutil.c: Update to use name of png file. lib/archetypes: collected - pl_dragon arch changed a while back, with no new collect. lib/collect.pl.in: Add some notes about usage if no option is given or if --help is given. server/gods.c: Fix that resulted in weapon/armor restrictions not working. MSW 2002-04-23 | |||
| Show difference between Revision 1.8 and 1.9 | |||
| Revision 1.8 | mwedel | 2001/12/15 21:31:03 | +2 -2 |
|
common/object.c random_maps/Makefile.in server/c_wiz.c server/player.c server/plugins.c server/timers.c socket/request.c: Most of the changes are to just fix compiling warnings or errors so that it compiles on sparc solaris with the workshop compiler (things like }; should just be }). Declaration for alphasort was missing in plugins.c. random_maps/Makefile.in had the wrong order in linking - the system library needs to be linked in after the crossfire libraries. crossedit/App.c: Fix for running on 8 bit color - colormap was not being initialized to usuable default value. crossedit/xutil.c: Broken code when duplicating faces for undefined images. That code should never really be used, as pixmaps currently are always contiguous. MSW 2001-12-15 | |||
| Show difference between Revision 1.7 and 1.8 | |||
| Revision 1.7 | mwedel | 2001/12/03 01:51:40 | +4 -118 |
|
This checkin for the most part removes support for xpm and xbm graphics - now the only image supported is the png. common/arch.c: comment out printing on warning of object having no type - getting 300 meaningless messages at startup is annoying. common/image.c: Remove X11 color information from colorname array. Remove processing of color_fg and color_bg information from face file - only use color_fg if no magicmap information is available - foreground and background infoformation was only needed for bitmap graphics. common/loader.c, loader.l: Add elevation element, comment out some logging messages that are excessive and only really relevant for people who want to fix them (really should be in the collect script anyways). Remove some unused code. common/map.c: add outdoor field to map structure - add support for loading and saving it. crossedit/App.c,crossedit/CrUtil.c, crossedit/Defines.h, crossedit/crossedit.c crossedit/xutil.c: Remove support for non png graphics. crossedit/Attr.c: Add support for elevation variable, remove code for non png graphics. doc/map-technical: Add note about outdoor field. include/face.h: remove fg, bg fields from face struecture. include/global.h: Update colorname array definition. include/loader.h: Add V_ELEVATION field. include/map.h: Add outdoor field to map structure. include/newserver.h: Update types so it only loads/knows about png information. include/object.h: Add elevation field to object structure. lib/Makefile.in: Remove support for building crossfire.xpm and crossfire.xbm files. lib/animations, lib/archetypes, lib/bmaps, lib/bmaps.paths, lib/crossfire.png, lib/faces: Rebuilt. Main difference is a few sea types, and the fact that it hadn't been collected for a while. server/spell_effect.c: Modify dimension door so that it calls MapNewmapCmd so that fog of war does not get confused. Also, removes call to draw as functions further up will do that. server/spell_util.c: Remove color information from attack information that shuffle_attack uses. socket/init.c, socket/request.c: Remove support for non png images. MSW 2001-12-02 | |||
| Show difference between Revision 1.6 and 1.7 | |||
| Revision 1.6 | mwedel | 2001/03/10 02:27:36 | +16 -4 |
|
MSW 2001/03/09: crossedit/App.c: Move the loading of images to later in the editor startup state. In this way, the client can allocate the colors it needs for its windows before the the png images use up all the colors. crossedit/png.c: New png loader implementation. New version is much faster (50 times faster). As part of this, only 8 bit displays, a private colormap will be allocated, and after that gets filled up, a color mapping routine will be used - this makes the png images loadable on an 8 bit system in addition to the speedup. crossedit/xutil.c: Adding timing information for loading of images. call init_pngx_loader before starting to load png images. Pass colormap to png_to_xpixmap by pointer and not value so that the loader can change the colormap. | |||
| Show difference between Revision 1.5 and 1.6 | |||
| Revision 1.5 | cvs | 2000/12/18 02:00:26 | +9 -2 |
|
File will now compile if XPM is not installed. MSW 2000/12/17 | |||
| Show difference between Revision 1.4 and 1.5 | |||
| Revision 1.4 | cvs | 2000/12/04 01:19:56 | +28 -5 |
|
MSW 2000/12/3: Misc changes. Main one is adding PNG support to the editor. TODO: Remove outdated things to do (like partial resistance code) configure, configure.in, include/autoconf.h.in: Add check for libpng. include/global.h: Remove displaymodes - moved to crossedit/Defines.h crossedit/App.c, crossedit/App.h crossedit/CrEdit.c crossedit/CrFace.c crossedit/CrList.c crossedit/CrUtil.c crossedit/Edit.c crossedit/crossedit.c crossedit/xutil.c, crossedit/png.c (new file): Add support for png display in crossedit. crossedit/Makefile.in: Add png.c file. server/c_misc.c: Change who command to only display real players, and not players in process of connecting/unconnecting. Also, remove code to display old sockets, since those are not supported anymore. | |||
| Show difference between Revision 1.3 and 1.4 | |||
| Revision 1.3 | cvs | 2000/05/13 18:44:43 | +49 -104 |
|
crossedit/xutil.c: Merge bitmap & pixmap load routine into one called ReadImages, function modified to use above format. crossedit/App.c: Call ReadImages to load images. include/newserver.h: Change FaceInfo structure to have arrays of data and datalength instead of explicity entries for pixmap vs bitmap data. lib/adm/make_xpm_file.pl, lib/crossfire.cfb, lib/xbmtobdf.c: Removed - either note needed or replaced by new naming scheme. lib/adm/collect_images.pl: Replacement/improvement of make_xpm_file.pl above - this handles all image formats (xbm, xpm, png). This is also more intelligent in that it will not try to rebuild the image files if there is not a valid arch directory. lib/crossfire.png, lib/crossfire.xbm (new files): .png file is for png images. xbm is to keep with the new standardized naming convention used and is for the bitmaps. lib/crossfire.xpm: New format used in file. lib/Makefile.in: Modified to collect via new script as well as new directives to collect (png files). socket/init.c: Modified to load with the new format and data structures. socket/request.c: Modified to send data with the new data structures provided. | |||
| Show difference between Revision 1.2 and 1.3 | |||
| Revision 1.2 | cvs | 1999/07/13 01:02:43 | +0 -0 |
|
Global commit for 0.95.4 - most files have no changes but just have differing headers between my local RCS and the CVS versions and need to get synced up. | |||
| Show difference between Revision 1.1 and 1.2 | |||
| Revision 1.1 | uid200 | 1999/04/02 13:10:11 | None |
|
Initial revision | |||
| First version | |||
| Revision 1.1.1.1 | uid200 | 1999/04/02 13:10:11 | +0 -0 |
|
First CVS revsion: crossfire-0.95.3 | |||
| Show difference between Revision 1.1 and 1.1.1.1 | |||