| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Sometimes, they're there to emphasize a break between two sections of code,
which is good. In a majority of cases, though, they're just inconsistent.
|
| |
|
|
|
|
|
| |
This creates the effect that the top half of the engulfed
character is emerging slightly out of the cloud.
|
|
|
|
|
|
|
|
|
|
|
| |
This works very well for the most part with
two small problems:
- Webtiles will not support this yet (in probability,
this will stop any clouds showing in webtiles)
- Floor items interact strangely and will draw over
the top of clouds instead of behind them
|
| |
|
|
|
|
|
| |
The perl one-liner I use for this had a bug where it didn't match "else"
at the end of a line (ie, most of the time).
|
|
|
|
|
| |
Scale up with the tile_cell_pixels option, and scale down when the
resolution is too low (instead of disabling tiles).
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.
I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.
I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.
|
| |
|
| |
|
|
|
|
|
|
| |
Conflicts:
crawl-ref/source/startup.cc
|
|
|
|
|
|
|
| |
"File:" is shown in your editor's status bar.
"Written by:" was used only for the first person who changed a file. We got
git for that now, and pre-DCSS history is so woefully inaccurate it doesn't
really matter.
|
| |
|
|
|
|
|
|
|
|
| |
This new type defines to unsigned int, but it cleans up a lot of the
int/unsigned int/short confusion all over the codebase for tile indices.
This commit also cleans up tiles code to use coord_def more and to change
function signatures to pass const refs and non-const pointers.
|
|
|
|
|
|
|
| |
Remove any non-const-reference parameters. Change const pointer
parameters to const reference parameters. Change all draw(NULL, NULL)
calls to just draw(). Also, refactor to remove pretranslate and prescale
parameters from draw calls.
|
|
|
|
|
|
| |
The amount of code complexity to draw ~6 extra transparent pixels isn't
really worth it. Also, the fact that it can't be turned on by default
due to bad OpenGL drivers means that few people are likely using it.
|
| |
|
|
|
|
|
|
| |
Storing member variable pointers to data, even const ones, is sketchy.
Better to depend on compiler optimizations to eliminate redundant
variable copies.
|
| |
|
|
|
|
|
| |
This avoids weird global state setting and then querying in the next
function.
|
| |
|
|
|
|
| |
Applying standards, simplifying code, removing redundant comments.
|
|
|
|
|
| |
It's not really used anywhere at this point, and it's better to call
clear explicitly when the draw buffer needs to be refilled.
|
|
|
|
| |
Signed-off-by: Enne Walker <enne.walker@gmail.com>
|
|
|
|
| |
Signed-off-by: Enne Walker <enne.walker@gmail.com>
|
|
|
|
| |
No need to check for NULL translate and scale.
|
|
|
|
|
|
| |
No spaces on parens. Line up function params. Sort includes more
rationally. Put curly braces on their own line. Don't C-style typedef
enum and structs. Put if-clauses on their own line.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
drawGLPrimitives and then updated tilebuf, font, reg, and sdl to use it propperly.
As well, tilebuf's VertBuffer::draw() method needed to be changed to allow passing to pre-render transformations (used in submerged tile rendering.)
|
| |
|
|
|
|
| |
to the new glwrapper files. Removed SDL_opengl from these files and instead have them call static members of the GLStateManager class.
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Alpha testing is apparently not a dependable feature of OpenGL. Instead,
provide an alternate method of drawing submerged tiles that does not
depend on it. The older (better looking, in my opinion) behavior can be
enabled via an option. It's off by default, so that folks don't file bug
reports about shallow water.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In order for jpeg's waves to work on deep water as well as shallow, we
need to not use partially transparent overlays to simulate an actor or an
item being submerged. Now, non-flying objects on water will be drawn
transparently to blend with the water below. This should mostly look the
same, except it will now work on top of waves and will not require a mask
for each water type.
As a nice side-effect, ghosts are now transparent again and the water on
top of submerged objects now animates properly.
See the comments in tilebuf.cc for details. The mask tile itself can be
adjusted to change the water level, but the parameters to
SubmergedTileBuffer will need to be changed to compensate depending on
what the new art looks like.
|
|
|
|
| |
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Sometimes we were doing #if DEBUG and others we were doing #ifdef DEBUG.
If we mix both, we have problems: If the DEBUG macro isn't defined, the
statement '#if DEBUG' doesn't really make sense logically, because 'DEBUG'
has no value. And if we '#define DEBUG 0', then the '#ifdef DEBUG's
become true statements.
The easiest fix is to swap out the #ifs with #ifdefs.
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
|
|
|
|
|
|
| |
MSVC is like a chimp with Down's syndrome.
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
selection menu.
* Add dolls_data to player_save_info struct, to make it easier to read
in per-character doll information once we get around to that.
Including the tiledef files in externs.h is probably overkill, though,
so we might want to move player_save_info into another header file.
* Fix Xom's repel stair effect moving shops.
* Fix decks granting permanent summons at low power (and only at low
power).
* Make default settings of the brand options consistent between init.txt
and initfile.cc.
* Update FAQ.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10086 c06c8d41-db1a-0410-9941-cceddc491573
|
|
|
|
|
|
|
| |
description for Sigmund.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9990 c06c8d41-db1a-0410-9941-cceddc491573
|
|
|
|
| |
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8399 c06c8d41-db1a-0410-9941-cceddc491573
|
|
|
|
| |
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8321 c06c8d41-db1a-0410-9941-cceddc491573
|
|
|
|
| |
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8218 c06c8d41-db1a-0410-9941-cceddc491573
|
|
|
|
| |
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8217 c06c8d41-db1a-0410-9941-cceddc491573
|
|
|
|
| |
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7294 c06c8d41-db1a-0410-9941-cceddc491573
|